diff --git a/cvm/conf/jtreg_hotspot8_excludes_aarch64.list b/cvm/conf/jtreg_hotspot8_excludes_aarch64.list index fcbf972671c..790ab107acd 100644 --- a/cvm/conf/jtreg_hotspot8_excludes_aarch64.list +++ b/cvm/conf/jtreg_hotspot8_excludes_aarch64.list @@ -1,23 +1,7 @@ compiler/6859338/Test6859338.java compiler/7196199/Test7196199.java compiler/8004741/Test8004741.java -compiler/8009761/Test8009761.java -compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java -compiler/classUnloading/methodUnloading/TestMethodUnloading.java compiler/EscapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java -compiler/floatingpoint/TestPow2.java -compiler/intrinsics/mathexact/sanity/AddExactLongTest.java -compiler/intrinsics/mathexact/sanity/AddExactIntTest.java -compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java -compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java -compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java -compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java -compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java -compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java -compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java -compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java -compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java -compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java compiler/intrinsics/muladd/TestMulAdd.java compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java @@ -29,7 +13,6 @@ compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java compiler/profiling/spectrapredefineclass/Launcher.java -compiler/rangechecks/TestRangeCheckSmearing.java compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java compiler/rtm/cli/TestRTMAbortThresholdOption.java @@ -56,19 +39,9 @@ compiler/tiered/ConstantGettersTransitionsTest.java compiler/tiered/NonTieredLevelsTest.java compiler/tiered/TieredLevelsTest.java compiler/tiered/LevelTransitionTest.java -compiler/types/correctness/CorrectnessTest.java -compiler/types/correctness/OffTest.java -compiler/types/TestMeetIncompatibleInterfaceArrays.java -compiler/whitebox/DeoptimizeAllTest.java -compiler/whitebox/ClearMethodStateTest.java -compiler/whitebox/DeoptimizeMultipleOSRTest.java compiler/whitebox/EnqueueMethodForCompilationTest.java -compiler/whitebox/DeoptimizeMethodTest.java compiler/whitebox/GetNMethodTest.java compiler/whitebox/MakeMethodNotCompilableTest.java -compiler/whitebox/IsMethodCompilableTest.java -compiler/whitebox/SetDontInlineMethodTest.java -compiler/whitebox/SetForceInlineMethodTest.java gc/6941923/Test6941923.java gc/arguments/TestAggressiveHeap.java gc/arguments/TestG1ConcRefinementThreads.java @@ -82,7 +55,6 @@ gc/arguments/TestUseCompressedOopsErgo.java gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java gc/class_unloading/TestG1ClassUnloadingHWM.java gc/ergonomics/TestDynamicNumberOfGCThreads.java -gc/g1/mixedgc/TestOldGenCollectionUsage.java gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java gc/g1/TestG1TraceEagerReclaimHumongousObjects.java gc/g1/TestGCLogMessages.java @@ -111,7 +83,6 @@ gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java gc/survivorAlignment/TestPromotionFromEdenToTenured.java gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java gc/survivorAlignment/TestPromotionToSurvivor.java -gc/whitebox/TestWBGC.java gc/TestGCLogRotationViaJcmd.java gc/TestMemoryMXBeansAndPoolsPresence.java gc/TestVerifyDuringStartup.java @@ -169,10 +140,6 @@ runtime/SharedArchiveFile/SharedBaseAddress.java runtime/SharedArchiveFile/SpaceUtilizationCheck.java serviceability/dcmd/ClassLoaderStatsTest.java serviceability/ParserTest.java -testlibrary/ctw/test/ClassesDirTest.java -testlibrary/ctw/test/ClassesListTest.java -testlibrary/ctw/test/JarDirTest.java -testlibrary/ctw/test/JarsTest.java testlibrary_tests/whitebox/vm_flags/DoubleTest.java testlibrary_tests/whitebox/vm_flags/IntxTest.java runtime/NMT/MallocStressTest.java diff --git a/cvm/conf/jtreg_hotspot8_excludes_x64.list b/cvm/conf/jtreg_hotspot8_excludes_x64.list index c089c7c99fc..04ab1ba40fd 100644 --- a/cvm/conf/jtreg_hotspot8_excludes_x64.list +++ b/cvm/conf/jtreg_hotspot8_excludes_x64.list @@ -1,23 +1,7 @@ compiler/6859338/Test6859338.java compiler/7196199/Test7196199.java compiler/8004741/Test8004741.java -compiler/8009761/Test8009761.java -compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java -compiler/classUnloading/methodUnloading/TestMethodUnloading.java compiler/EscapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java -compiler/floatingpoint/TestPow2.java -compiler/intrinsics/mathexact/sanity/AddExactLongTest.java -compiler/intrinsics/mathexact/sanity/AddExactIntTest.java -compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java -compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java -compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java -compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java -compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java -compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java -compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java -compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java -compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java -compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java compiler/intrinsics/muladd/TestMulAdd.java compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java @@ -29,7 +13,6 @@ compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java compiler/profiling/spectrapredefineclass/Launcher.java -compiler/rangechecks/TestRangeCheckSmearing.java compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java @@ -50,19 +33,9 @@ compiler/tiered/ConstantGettersTransitionsTest.java compiler/tiered/NonTieredLevelsTest.java compiler/tiered/TieredLevelsTest.java compiler/tiered/LevelTransitionTest.java -compiler/types/correctness/CorrectnessTest.java -compiler/types/correctness/OffTest.java -compiler/types/TestMeetIncompatibleInterfaceArrays.java -compiler/whitebox/DeoptimizeAllTest.java -compiler/whitebox/ClearMethodStateTest.java -compiler/whitebox/DeoptimizeMultipleOSRTest.java compiler/whitebox/EnqueueMethodForCompilationTest.java -compiler/whitebox/DeoptimizeMethodTest.java compiler/whitebox/GetNMethodTest.java compiler/whitebox/MakeMethodNotCompilableTest.java -compiler/whitebox/IsMethodCompilableTest.java -compiler/whitebox/SetDontInlineMethodTest.java -compiler/whitebox/SetForceInlineMethodTest.java gc/6941923/Test6941923.java gc/arguments/TestAggressiveHeap.java gc/arguments/TestG1ConcRefinementThreads.java @@ -76,7 +49,6 @@ gc/arguments/TestUseCompressedOopsErgo.java gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java gc/class_unloading/TestG1ClassUnloadingHWM.java gc/ergonomics/TestDynamicNumberOfGCThreads.java -gc/g1/mixedgc/TestOldGenCollectionUsage.java gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java gc/g1/TestG1TraceEagerReclaimHumongousObjects.java gc/g1/TestGCLogMessages.java @@ -105,7 +77,6 @@ gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java gc/survivorAlignment/TestPromotionFromEdenToTenured.java gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java gc/survivorAlignment/TestPromotionToSurvivor.java -gc/whitebox/TestWBGC.java gc/TestGCLogRotationViaJcmd.java gc/TestMemoryMXBeansAndPoolsPresence.java gc/TestVerifyDuringStartup.java @@ -163,10 +134,6 @@ runtime/SharedArchiveFile/SharedBaseAddress.java runtime/SharedArchiveFile/SpaceUtilizationCheck.java serviceability/dcmd/ClassLoaderStatsTest.java serviceability/ParserTest.java -testlibrary/ctw/test/ClassesDirTest.java -testlibrary/ctw/test/ClassesListTest.java -testlibrary/ctw/test/JarDirTest.java -testlibrary/ctw/test/JarsTest.java testlibrary_tests/whitebox/vm_flags/DoubleTest.java testlibrary_tests/whitebox/vm_flags/IntxTest.java testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java @@ -177,5 +144,4 @@ compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java -compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java runtime/containers/docker/DockerBasicTest.java diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index 37af392589a..91657a78362 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -2374,8 +2374,12 @@ WB_END static JNINativeMethod methods[] = { #if HOTSPOT_TARGET_CLASSLIB == 8 {CC"getObjectAddress", CC"(Ljava/lang/Object;)J", (void*)&WB_GetObjectAddress }, + {CC"getObjectSize", CC"(Ljava/lang/Object;)J", (void*)&WB_GetObjectSize }, + {CC"isObjectInOldGen", CC"(Ljava/lang/Object;)Z", (void*)&WB_isObjectInOldGen }, #elif HOTSPOT_TARGET_CLASSLIB == 17 {CC"getObjectAddress0", CC"(Ljava/lang/Object;)J", (void*)&WB_GetObjectAddress }, + {CC"getObjectSize0", CC"(Ljava/lang/Object;)J", (void*)&WB_GetObjectSize }, + {CC"isObjectInOldGen0", CC"(Ljava/lang/Object;)Z", (void*)&WB_isObjectInOldGen }, #else #error "Only classlib 8 and 17 are supported." #endif @@ -2443,6 +2447,16 @@ static JNINativeMethod methods[] = { {CC"deoptimizeFrames", CC"(Z)I", (void*)&WB_DeoptimizeFrames }, {CC"isFrameDeoptimized", CC"(I)Z", (void*)&WB_IsFrameDeoptimized}, {CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll }, +#if HOTSPOT_TARGET_CLASSLIB == 8 + {CC"deoptimizeMethod", CC"(Ljava/lang/reflect/Executable;Z)I", + (void*)&WB_DeoptimizeMethod }, + {CC"isMethodCompiled", CC"(Ljava/lang/reflect/Executable;Z)Z", + (void*)&WB_IsMethodCompiled }, + {CC"isMethodCompilable", CC"(Ljava/lang/reflect/Executable;IZ)Z", + (void*)&WB_IsMethodCompilable}, + {CC"isMethodQueuedForCompilation", + CC"(Ljava/lang/reflect/Executable;)Z", (void*)&WB_IsMethodQueuedForCompilation}, +#elif HOTSPOT_TARGET_CLASSLIB == 17 {CC"deoptimizeMethod0", CC"(Ljava/lang/reflect/Executable;Z)I", (void*)&WB_DeoptimizeMethod }, {CC"isMethodCompiled0", CC"(Ljava/lang/reflect/Executable;Z)Z", @@ -2451,29 +2465,52 @@ static JNINativeMethod methods[] = { (void*)&WB_IsMethodCompilable}, {CC"isMethodQueuedForCompilation0", CC"(Ljava/lang/reflect/Executable;)Z", (void*)&WB_IsMethodQueuedForCompilation}, +#else + #error "Only classlib 8 and 17 are supported." +#endif {CC"isIntrinsicAvailable0", CC"(Ljava/lang/reflect/Executable;Ljava/lang/reflect/Executable;I)Z", (void*)&WB_IsIntrinsicAvailable}, {CC"makeMethodNotCompilable0", CC"(Ljava/lang/reflect/Executable;IZ)V", (void*)&WB_MakeMethodNotCompilable}, +#if HOTSPOT_TARGET_CLASSLIB == 8 + {CC"testSetDontInlineMethod", + CC"(Ljava/lang/reflect/Executable;Z)Z", (void*)&WB_TestSetDontInlineMethod}, + {CC"getMethodCompilationLevel", + CC"(Ljava/lang/reflect/Executable;Z)I", (void*)&WB_GetMethodCompilationLevel}, + {CC"getMethodEntryBci", + CC"(Ljava/lang/reflect/Executable;)I", (void*)&WB_GetMethodEntryBci}, + {CC"testSetForceInlineMethod", + CC"(Ljava/lang/reflect/Executable;Z)Z", (void*)&WB_TestSetForceInlineMethod}, +#elif HOTSPOT_TARGET_CLASSLIB == 17 {CC"testSetDontInlineMethod0", CC"(Ljava/lang/reflect/Executable;Z)Z", (void*)&WB_TestSetDontInlineMethod}, {CC"getMethodCompilationLevel0", CC"(Ljava/lang/reflect/Executable;Z)I", (void*)&WB_GetMethodCompilationLevel}, {CC"getMethodEntryBci0", CC"(Ljava/lang/reflect/Executable;)I", (void*)&WB_GetMethodEntryBci}, - {CC"getCompileQueueSize", - CC"(I)I", (void*)&WB_GetCompileQueueSize}, {CC"testSetForceInlineMethod0", CC"(Ljava/lang/reflect/Executable;Z)Z", (void*)&WB_TestSetForceInlineMethod}, +#else + #error "Only classlib 8 and 17 are supported." +#endif + {CC"getCompileQueueSize", + CC"(I)I", (void*)&WB_GetCompileQueueSize}, {CC"enqueueMethodForCompilation0", CC"(Ljava/lang/reflect/Executable;II)Z", (void*)&WB_EnqueueMethodForCompilation}, {CC"enqueueInitializerForCompilation0", CC"(Ljava/lang/Class;I)Z", (void*)&WB_EnqueueInitializerForCompilation}, {CC"markMethodProfiled", CC"(Ljava/lang/reflect/Executable;)V", (void*)&WB_MarkMethodProfiled}, +#if HOTSPOT_TARGET_CLASSLIB == 8 + {CC"clearMethodState", + CC"(Ljava/lang/reflect/Executable;)V", (void*)&WB_ClearMethodState}, +#elif HOTSPOT_TARGET_CLASSLIB == 17 {CC"clearMethodState0", CC"(Ljava/lang/reflect/Executable;)V", (void*)&WB_ClearMethodState}, +#else + #error "Only classlib 8 and 17 are supported." +#endif {CC"lockCompilation", CC"()V", (void*)&WB_LockCompilation}, {CC"unlockCompilation", CC"()V", (void*)&WB_UnlockCompilation}, {CC"matchesMethod", @@ -2526,7 +2563,13 @@ static JNINativeMethod methods[] = { {CC"metaspaceCapacityUntilGC", CC"()J", (void*)&WB_MetaspaceCapacityUntilGC }, {CC"metaspaceSharedRegionAlignment", CC"()J", (void*)&WB_MetaspaceSharedRegionAlignment }, {CC"getCPUFeatures", CC"()Ljava/lang/String;", (void*)&WB_GetCPUFeatures }, +#if HOTSPOT_TARGET_CLASSLIB == 8 + {CC"getNMethod", CC"(Ljava/lang/reflect/Executable;Z)[Ljava/lang/Object;", +#elif HOTSPOT_TARGET_CLASSLIB == 17 {CC"getNMethod0", CC"(Ljava/lang/reflect/Executable;Z)[Ljava/lang/Object;", +#else + #error "Only classlib 8 and 17 are supported." +#endif (void*)&WB_GetNMethod }, {CC"forceNMethodSweep", CC"()V", (void*)&WB_ForceNMethodSweep }, {CC"allocateCodeBlob", CC"(II)J", (void*)&WB_AllocateCodeBlob },