diff --git a/openjdk/excludes/ProblemList_openjdkvalhalla-openj9.txt b/openjdk/excludes/ProblemList_openjdkvalhalla-openj9.txt
index fcbf469309..29e4e44019 100644
--- a/openjdk/excludes/ProblemList_openjdkvalhalla-openj9.txt
+++ b/openjdk/excludes/ProblemList_openjdkvalhalla-openj9.txt
@@ -54,7 +54,6 @@ java/lang/invoke/defineHiddenClass/PreviewHiddenClass.java https://github.com/ec
############################################################################
runtime/valhalla/inlinetypes/AcmpTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/ArrayQueryTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-runtime/valhalla/inlinetypes/ClassPrintLayoutDcmd.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/EmptyInlineTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/FlatArraysTest.java#default https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/FlatArraysTest.java#no-array-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
@@ -74,16 +73,13 @@ runtime/valhalla/inlinetypes/ObjectMethods.java#compressed-class-pointers https:
runtime/valhalla/inlinetypes/ObjectMethods.java#no-compressed-class-pointers https://github.com/eclipse-openj9/openj9/issues/15768 generic-all
runtime/valhalla/inlinetypes/PreloadCircularityTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/QuickeningTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-runtime/valhalla/inlinetypes/StaticFieldsTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-runtime/valhalla/inlinetypes/TestCloneableValue.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
+runtime/valhalla/inlinetypes/TestCloneableValue.java https://github.com/eclipse-openj9/openj9/issues/15768 generic-all
runtime/valhalla/inlinetypes/TestFieldNullability.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/TestFlatArrayElementMaxOops.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/TestFlatArrayElementMaxOops.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/TestFlatArrayElementMaxOops.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/TestInheritedInlineTypeFields.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/TestJNIIsSameObject.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-runtime/valhalla/inlinetypes/ValuePreloadTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-runtime/valhalla/inlinetypes/ValueTearing.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/VolatileTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/classfileparser/IllegalFieldModifiers.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
runtime/valhalla/inlinetypes/classfileparser/NullRestrictionWithoutPreview.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
@@ -99,14 +95,7 @@ runtime/valhalla/inlinetypes/classloading/PreLoadFailuresDoNotImpactApplicationT
# hotspot_valhalla - serviceability/jvmti/valhalla
############################################################################
-serviceability/jvmti/valhalla/FieldAccessModify/FieldAccessModify.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-serviceability/jvmti/valhalla/ForceEarlyReturn/ValueForceEarlyReturn.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-serviceability/jvmti/valhalla/GetClassFields/ValueGetClassFields.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
serviceability/jvmti/valhalla/GetObjectHashCode/ValueGetObjectHashCodeTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-serviceability/jvmti/valhalla/GetObjectMonitorUsage/ValueGetObjectMonitorUsage.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-serviceability/jvmti/valhalla/GetObjectSize/ValueGetObjectSize.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-serviceability/jvmti/valhalla/GetSetLocal/ValueGetSetLocal.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-serviceability/jvmti/valhalla/HeapwalkDupClasses/HeapwalkDupClasses.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
serviceability/jvmti/valhalla/Heapwalking/ValueHeapwalkingTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
serviceability/jvmti/valhalla/SetTag/ValueTagMapTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
@@ -115,35 +104,13 @@ serviceability/jvmti/valhalla/SetTag/ValueTagMapTest.java https://github.com/ecl
# hotspot_valhalla - compiler/valhalla
############################################################################
-compiler/valhalla/inlinetypes/BlackholeTest.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/PutFlatValueWithoutUseArrayFlattening.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/RepairStackWithBigFrame.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestAcmpEdgeCases.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestArrayCopy.java#AlwaysIncrementalInline https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestArrayCopy.java#NoArrayFlattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestArrayCopy.java#default https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestArrayCopy.java#NoTraps https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrayCopyWithOops.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrayCopyWithOops.java#default https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestArrayCopyWithOops.java#do https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestArrayCopyWithOops.java#do-no-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestArrays.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestBufferTearing.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestC1.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestCallingConventionC1.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestFieldNullMarkers.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestFieldNullMarkers.java#AVF https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestFieldNullMarkers.java#AVF-nAVF https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
@@ -160,66 +127,6 @@ compiler/valhalla/inlinetypes/TestFieldNullMarkers.java#nAVF https://github.com/
compiler/valhalla/inlinetypes/TestFieldNullMarkers.java#no-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestFieldNullMarkers.java#noFlags https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
compiler/valhalla/inlinetypes/TestFlatArrayThreshold.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestFlatInArraysFolding.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestGetfieldChains.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestInlineFieldNonFlattened.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestIntrinsics.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestJNICalls.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorld.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLWorldProfiling.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestLarvalState.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestMethodHandles.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableArrays.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id0 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id1 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id3 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id4 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id5 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id6 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#c2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#c2-no-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#default https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#no-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp-c2 https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp-c2-no-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp-no-flattening https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestUnresolvedInlineClass.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
-compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
############################################################################
@@ -227,6 +134,7 @@ compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java https://gi
############################################################################
compiler/valhalla/inlinetypes/CorrectlyRestoreRfp.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/PutFlatValueWithoutUseArrayFlattening.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestAllocationMergeAndFolding.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
@@ -247,7 +155,23 @@ compiler/valhalla/inlinetypes/TestArrayNullMarkers.java#all-flattening-restrict-
compiler/valhalla/inlinetypes/TestArrayNullMarkers.java#default https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestArrayNullMarkers.java#nAVF https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestArrayNullMarkers.java#no-flattening https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestArrays.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestBasicFunctionality.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/bootstrap/TestBootClassloader.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestC1.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestCallingConventionC1.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestCallingConvention.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestCallingConvention.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestCallingConvention.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
@@ -270,9 +194,57 @@ compiler/valhalla/inlinetypes/TestDeoptimizationWhenBuffering.java#no-mono-no-FF
compiler/valhalla/inlinetypes/TestDeoptimizationWhenBuffering.java#no-mono-no-FF-AII https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestDeoptimizationWhenBuffering.java#no-mono-no-field https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestDeoptimizationWhenBuffering.java#no-mono-no-field-AII https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestFlatInArraysFolding.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestGetfieldChains.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestInlineFieldNonFlattened.java https://github.com/eclipse-openj9/openj9/issues/13182 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestIntrinsics.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestJNICalls.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLarvalState.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestLoadingDefaultRefinedArrayKlass.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorld.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestLWorldProfiling.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestMethodHandles.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestMismatchHandling.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestNewAcmp.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableArrays.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id4 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id5 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestNullableInlineTypes.java#id6 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestOnStackReplacement.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestOnStackReplacement.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestOnStackReplacement.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
@@ -290,7 +262,18 @@ compiler/valhalla/inlinetypes/TestOopsInReturnConvention.java#int https://github
compiler/valhalla/inlinetypes/TestOopsInReturnConvention.java#int-no-preload https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestOopsInReturnConvention.java#int-stress-cc https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestScalarReplaceFlatFields.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#c2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#c2-no-flattening https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#default https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#no-flattening https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp-c2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp-c2-no-flattening https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java#xcomp-no-flattening https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnloadedInlineTypeField.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestUnloadedReturnTypes.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestUnresolvedInlineClass.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestValueClasses.java#id0 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestValueClasses.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestValueClasses.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
@@ -312,6 +295,7 @@ compiler/valhalla/inlinetypes/TestValueConstruction.java#StressIncrementalInlini
compiler/valhalla/inlinetypes/TestValueConstruction.java#StressIncrementalInliningDontInlineObjectInit https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestValueConstruction.java#StressIncrementalInliningOnStackReplacement https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestValueConstruction.java#Xbatch https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+compiler/valhalla/inlinetypes/TestValueRematDuringTypeSharpening.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestVirtualThreads.java#ci https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestVirtualThreads.java#ci-test https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestVirtualThreads.java#ci-test-di https://github.com/adoptium/aqa-tests/issues/1297 generic-all
@@ -326,8 +310,9 @@ compiler/valhalla/inlinetypes/TestVirtualThreads.java#xcomp-co-test-di https://g
compiler/valhalla/inlinetypes/TestVirtualThreads.java#xcomp-co-test-di-exclude-helper https://github.com/adoptium/aqa-tests/issues/1297 generic-all
compiler/valhalla/inlinetypes/TestVirtualThreads.java#xcomp-co-test-di-helper https://github.com/adoptium/aqa-tests/issues/1297 generic-all
runtime/valhalla/inlinetypes/AnnotationsTests.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
-runtime/valhalla/inlinetypes/DirectMethodTest.java#default https://github.com/eclipse-openj9/openj9/issues/15768 generic-all
-runtime/valhalla/inlinetypes/DirectMethodTest.java#no-array-flattening https://github.com/eclipse-openj9/openj9/issues/15768 generic-all
+runtime/valhalla/inlinetypes/ClassPrintLayoutDcmd.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+runtime/valhalla/inlinetypes/DirectMethodTest.java#default https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+runtime/valhalla/inlinetypes/DirectMethodTest.java#no-array-flattening https://github.com/adoptium/aqa-tests/issues/1297 generic-all
runtime/valhalla/inlinetypes/field_layout/EmptyValueTest.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
runtime/valhalla/inlinetypes/field_layout/FieldAlignmentTest.java#64_COOP_CCP_COH https://github.com/adoptium/aqa-tests/issues/1297 generic-all
runtime/valhalla/inlinetypes/field_layout/FieldAlignmentTest.java#64_COOP_CCP_NCOH https://github.com/adoptium/aqa-tests/issues/1297 generic-all
@@ -371,4 +356,5 @@ runtime/valhalla/inlinetypes/LarvalMarkWordTest.java#id0 https://github.com/adop
runtime/valhalla/inlinetypes/LarvalMarkWordTest.java#id1 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
runtime/valhalla/inlinetypes/LarvalMarkWordTest.java#id2 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
runtime/valhalla/inlinetypes/LarvalMarkWordTest.java#id3 https://github.com/adoptium/aqa-tests/issues/1297 generic-all
+runtime/valhalla/inlinetypes/ValuePreloadTest.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
valhalla/valuetypes/LayoutIterationTest.java https://github.com/adoptium/aqa-tests/issues/1297 generic-all
diff --git a/openjdk/openjdk.mk b/openjdk/openjdk.mk
index 29b2753c91..1a786e8c3f 100644
--- a/openjdk/openjdk.mk
+++ b/openjdk/openjdk.mk
@@ -180,6 +180,8 @@ FULLPATH_LANGTOOLS_CUSTOM_TARGET = $(foreach target,$(LANGTOOLS_CUSTOM_TARGET),$
JDK_NATIVE_OPTIONS :=
JVM_NATIVE_OPTIONS :=
+# Use for J9 tests that require hotspot native images
+JVM_NATIVE_OPTIONS_HOTSPOT_FOR_J9 :=
ifneq ($(JDK_VERSION),8)
ifdef TESTIMAGE_PATH
@@ -189,6 +191,7 @@ ifneq ($(JDK_VERSION),8)
# else if JDK_IMPL is openj9 or ibm
else ifneq ($(filter openj9 ibm, $(JDK_IMPL)),)
JVM_NATIVE_OPTIONS := -nativepath:"$(TESTIMAGE_PATH)$(D)openj9"
+ JVM_NATIVE_OPTIONS_HOTSPOT_FOR_J9 := -nativepath:"$(TESTIMAGE_PATH)$(D)hotspot$(D)jtreg$(D)native"
ifeq ($(OS),OS/390)
ZOS_ONLY_NATIVE_LIBPATH := -e LIBPATH=$(TESTIMAGE_PATH)$(D)hotspot$(D)jtreg$(D)native
endif
diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml
index 74f4ef3f10..409055e2d4 100644
--- a/openjdk/playlist.xml
+++ b/openjdk/playlist.xml
@@ -57,7 +57,8 @@
-XX:ValueTypeFlatteningThreshold=99999 -XX:+EnableArrayFlattening
$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
- $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) \
+ $(JTREG_BASIC_OPTIONS) \
+ $(JVM_NATIVE_OPTIONS_HOTSPOT_FOR_J9) \
-vmoptions:$(Q)-Xmx512m --patch-module java.base=$(TEST_JDK_HOME)$(D)lib$(D)valueclasses$(D)java.base-valueclasses.jar \
--enable-preview -Djdk.debug=release $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(TIMEOUT_HANDLER) \
@@ -198,7 +199,7 @@
hotspot_custom_j9
$(JAVA_COMMAND) -Xmx512m $(APPLICATION_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
- $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
+ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS_HOTSPOT_FOR_J9) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(TIMEOUT_HANDLER) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(REPORTDIR)$(D)report$(Q) \
@@ -606,7 +607,7 @@
Mode1000
$(JAVA_COMMAND) -Xmx512m $(APPLICATION_OPTIONS) -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
- $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" ${ZOS_ONLY_NATIVE_LIBPATH} -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
+ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS_HOTSPOT_FOR_J9) ${ZOS_ONLY_NATIVE_LIBPATH} -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(TIMEOUT_HANDLER) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \
@@ -646,7 +647,7 @@
Mode1000
$(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \
- $(JTREG_BASIC_OPTIONS) -nativepath:"$(TESTIMAGE_PATH)/hotspot/jtreg/native" -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
+ $(JTREG_BASIC_OPTIONS) $(JVM_NATIVE_OPTIONS_HOTSPOT_FOR_J9) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \
$(TIMEOUT_HANDLER) \
-w $(Q)$(REPORTDIR)$(D)work$(Q) \
-r $(Q)$(TEST_RESROOT)$(D)report$(Q) \