8315127: CDSMapTest fails with incorrect number of oop references #15527

iklam · 2023-09-01T00:18:20Z

This is a bug in the test case. The test parses patterns like this in the map file

0x00000000ffe00000: @@ Object (0xffe00000) java.lang.String
 - klass: 'java/lang/String' 0x0000000800010220
 - fields (3 words):
 - private 'hash' 'I' @12  0 (0x00000000)
 - private final 'coder' 'B' @16  0 (0x00)
 - private 'hashIsZero' 'Z' @17  true (0x01)
 - injected 'flags' 'B' @18  1 (0x01)
 - private final 'value' '[B' @20 0x00000000ffe00018 (0xffe00018) [B length: 0
0x00000000ffe00018: @@ Object (0xffe00018) [B length: 0
 - klass: {type array byte} 0x00000008000024d8

Before this fix, the test assets that there are at least 10000 oop references (such as the value field in the above String). However, some JDK builds may have fewer archived heap objects, resulting in less than 10000 references (the graal build in the bug report has only 8286 references).

After this fix, we check that the number of oop references is not fewer than the number of strings, as we know each string contains one oop field. This is sufficient to check that the map file contains expected output, without using a hard-coded number.

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8315127: CDSMapTest fails with incorrect number of oop references (Bug - P4)

Reviewers

Calvin Cheung (@calvinccheung - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15527/head:pull/15527
$ git checkout pull/15527

Update a local copy of the PR:
$ git checkout pull/15527
$ git pull https://git.openjdk.org/jdk.git pull/15527/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15527

View PR using the GUI difftool:
$ git pr show -t 15527

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15527.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2023-09-01T00:19:03Z

👋 Welcome back iklam! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-09-01T00:21:42Z

@iklam The following label will be automatically applied to this pull request:

hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2023-09-01T00:26:14Z

Webrevs

01: Full - Incremental (263c1742)
00: Full (d0b02fdd)

calvinccheung

I have one question and spotted two minor issues.

calvinccheung · 2023-09-01T04:31:33Z

test/hotspot/jtreg/runtime/cds/CDSMapReader.java

@@ -282,16 +309,29 @@ public static int validate(MapFile mapFile) {
                    //     To see how an invalidate pointer may be found, change oop in the
                    //     following line to oop+1
                    mustContain(mapFile.oopToObject, field, oop, false);
-                    count ++;
+                    count1 ++;


Could oop be 0? If so, oop could be overcounted.

Pre-existing: extra import at line 27
import java.io.RandomAccessFile;

I added checks for oop != 0, so now the test is counting only the non-null references.

calvinccheung · 2023-09-01T04:36:42Z

test/hotspot/jtreg/runtime/cds/CDSMapTest.java

-            throw new RuntimeException("CDS map file seems incorrect: " + mapFile.heapObjectCount() +
-                                       " objects but only " + oopFieldCount + " oop field references");
-        }
+        CDSMapReader.validate(mapFile);


Pre-existing: extra import at lines 36 and 37

import java.io.FileInputStream; import java.io.IOException;

turbanoff · 2023-09-01T20:27:23Z

test/hotspot/jtreg/runtime/cds/CDSMapReader.java

@@ -254,7 +279,8 @@ public static MapFile read(String fileName) {
            throw new RuntimeException(t);
        } finally {
            System.out.println("Parsed " + lineCount + " lines in " + fileName);
-            System.out.println("Found "  + mapFile.heapObjectCount() + " heap objects");
+            System.out.println("Found "  + mapFile.heapObjectCount() + " heap objects ("


Suggested change

System.out.println("Found " + mapFile.heapObjectCount() + " heap objects ("

System.out.println("Found " + mapFile.heapObjectCount() + " heap objects ("

calvinccheung

Thanks for the update. It looks good.

openjdk · 2023-09-02T02:36:24Z

@iklam This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8315127: CDSMapTest fails with incorrect number of oop references

Reviewed-by: ccheung

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 22 new commits pushed to the master branch:

4f90aba: 8311585: Add JRadioButtonMenuItem to bug8031573.java
2a11bc4: 8314837: 5 compiled/codecache tests ignore VM flags
2f7c65e: 8303427: Fixpath confused if unix root contains "/jdk"
e9e0c56: 8314319: LogCompilation doesn't reset lateInlining when it encounters a failure.
56b8db1: 8258970: Disabled JPasswordField foreground color is wrong with GTK LAF
0d4cadb: 8315195: RISC-V: Update hwprobe query for new extensions
b4f7069: 8315446: G1: Remove unused G1AllocRegion::attempt_allocation
cf02cf3: 8315098: Improve URLEncodeDecode microbenchmark
c32e340: 8315321: [aix] os::attempt_reserve_memory_at must map at the requested address or fail
42f5b9e: 8315436: HttpsServer does not send TLS alerts
... and 12 more: https://git.openjdk.org/jdk/compare/c8acab1d913a6c676706fce7ad98a7f831a95682...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

iklam · 2023-09-05T20:54:09Z

Thanks @calvinccheung and @turbanoff for the review and comments.
/integrate

openjdk · 2023-09-05T20:56:11Z

Going to push as commit 1f4cdb3.
Since your change was applied there have been 49 commits pushed to the master branch:

939d7c5: 8161536: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with ProviderException
ebe3127: 8315717: ProblemList serviceability/sa/TestHeapDumpForInvokeDynamic.java with ZGC
969fcdb: 8314191: C2 compilation fails with "bad AD file"
cef9fff: 8305507: Add support for grace period before AbortVMOnSafepointTimeout triggers
ed2b467: 8315499: build using devkit on Linux ppc64le RHEL puts path to devkit into libsplashscreen
4b44575: 8305637: Remove Opaque1 nodes for Parse Predicates and clean up useless predicate elimination
8647f00: 8293850: need a largest_committed metric for each category of NMT's output
5a2e151: 8315548: G1: Document why VM_G1CollectForAllocation::doit() may allocate without completing a GC
9013b03: 8315442: Enable parallelism in vmTestbase/nsk/monitoring/stress/thread tests
744b397: 8312491: Update Classfile API snippets and examples
... and 39 more: https://git.openjdk.org/jdk/compare/c8acab1d913a6c676706fce7ad98a7f831a95682...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-09-05T20:56:17Z

@iklam Pushed as commit 1f4cdb3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

iklam added 2 commits August 31, 2023 17:00

8315127: CDSMapTest fails with incorrect number of oop references

32ea6f1

fix comments; tightened check

d0b02fd

openjdk bot added the rfr Pull request is ready for review label Sep 1, 2023

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Sep 1, 2023

calvinccheung reviewed Sep 1, 2023

View reviewed changes

turbanoff reviewed Sep 1, 2023

View reviewed changes

@calvinccheung and @turbanoff review comments

263c174

calvinccheung approved these changes Sep 2, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 2, 2023

openjdk bot added the integrated Pull request has been integrated label Sep 5, 2023

openjdk bot closed this Sep 5, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8315127: CDSMapTest fails with incorrect number of oop references #15527

8315127: CDSMapTest fails with incorrect number of oop references #15527

iklam commented Sep 1, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 1, 2023

openjdk bot commented Sep 1, 2023

mlbridge bot commented Sep 1, 2023 •

edited

Loading

calvinccheung left a comment

calvinccheung Sep 1, 2023

iklam Sep 1, 2023

calvinccheung Sep 1, 2023

iklam Sep 1, 2023

turbanoff Sep 1, 2023

iklam Sep 1, 2023

calvinccheung left a comment

openjdk bot commented Sep 2, 2023

iklam commented Sep 5, 2023

openjdk bot commented Sep 5, 2023

openjdk bot commented Sep 5, 2023

	System.out.println("Found " + mapFile.heapObjectCount() + " heap objects ("
	System.out.println("Found " + mapFile.heapObjectCount() + " heap objects ("

8315127: CDSMapTest fails with incorrect number of oop references #15527

8315127: CDSMapTest fails with incorrect number of oop references #15527

Conversation

iklam commented Sep 1, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Sep 1, 2023

openjdk bot commented Sep 1, 2023

mlbridge bot commented Sep 1, 2023 • edited Loading

Webrevs

calvinccheung left a comment

Choose a reason for hiding this comment

calvinccheung Sep 1, 2023

Choose a reason for hiding this comment

iklam Sep 1, 2023

Choose a reason for hiding this comment

calvinccheung Sep 1, 2023

Choose a reason for hiding this comment

iklam Sep 1, 2023

Choose a reason for hiding this comment

turbanoff Sep 1, 2023

Choose a reason for hiding this comment

iklam Sep 1, 2023

Choose a reason for hiding this comment

calvinccheung left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 2, 2023

iklam commented Sep 5, 2023

openjdk bot commented Sep 5, 2023

openjdk bot commented Sep 5, 2023

iklam commented Sep 1, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 1, 2023 •

edited

Loading