cvm/overlay: Fix gc/g1 StringDedup tests#140
Open
duanyangjing wants to merge 2 commits into
Open
Conversation
Adapt gc/g1 StringDeduplication tests for JDK17 hotspot, using the original JDK 8 implementation as baseline. TestStringDeduplicationTools.java: - Replace JDK 8 legacy GC log flags (PrintGCDetails, PrintStringDeduplicationStatistics) with JDK 17 Unified Logging (-Xlog:gc*,stringdedup*) - Update GC output assertions to match the JDK 17 Unified Logging format - Update StringDeduplicationAgeThreshold error message assertion to match JDK17 hotspot behavior - Adapt InternedTest: Replace the JDK 8 implementation with JDK 17 logic which verifies that interned strings are always deduplicated when being interned, and never after being interned - Update testPrintOptions: Use -Xlog:gc*,stringdedup* (info) to verify concurrent deduplication log presence instead of using JDK 8 specific flags Keep TestStringDeduplicationTableRehash.java excluded since JDK17 hotspot removed the string deduplication table rehash mechanism.
superajun-wsj
approved these changes
May 21, 2026
luchsh
requested changes
May 21, 2026
luchsh
left a comment
luchsh
left a comment
Collaborator
There was a problem hiding this comment.
after applying this patch, the modified test will no longer be suitable for a jdk8 build, is that a decided project specification?
| $(call overlay_single,jdk8u,hotspot/test/gc/arguments/TestUseCompressedOopsErgoTools.java, $(JDK8_SRCROOT)) | ||
| $(call overlay_single,jdk8u,hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java, $(JDK8_SRCROOT)) | ||
| $(call overlay_single,jdk8u,hotspot/test/gc/startup_warnings/TestDefaultMaxRAMFraction.java, $(JDK8_SRCROOT)) | ||
| $(call overlay_single,jdk8u,hotspot/test/gc/g1/TestStringDeduplicationTools.java, $(JDK8_SRCROOT)) |
Collaborator
There was a problem hiding this comment.
there seems to be many tests to be processed, can we make a loop to do that recursively from overlay/jdk8u to $(JDK8_SRCROOT)?
|
|
||
| private static boolean waitForDeduplication(String s1, String s2) { | ||
| boolean first = true; | ||
| int timeout = 10000; // 10sec in ms |
Collaborator
There was a problem hiding this comment.
put the unit in var name will make it self-explainable
Collaborator
Author
There was a problem hiding this comment.
This line is ported from jdk17
| System.out.println("End: InternedTest"); | ||
| } | ||
|
|
||
| private static void checkNotDeduplicated(Object value1, Object value2) { |
Collaborator
Author
There was a problem hiding this comment.
This function is ported from jdk17
| // Force internedString to be inspected for deduplication. | ||
| // Because it was interned it should be queued up for | ||
| // dedup, even though it hasn't reached the age threshold. | ||
| doYoungGc(1); |
Collaborator
There was a problem hiding this comment.
the original test does not seem to have this gc call, why did you add it?
Collaborator
Author
There was a problem hiding this comment.
This logic is ported from jdk17
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adapted gc/g1 StringDedup tests for JDK 17 compatibility.
Key changes:
Replaced JDK 8 style logging flags with JDK 17 Unified Logging (-Xlog:gc+stringdedup=debug).
Adapted expected error messages and output patterns to match JDK 17 behavior.
One deprecated test case (SurvivorAlignmentInBytes related) has been excluded and recorded as per the policy.