8332340: Add JavacBench as a test case for CDS #19256

iklam · 2024-05-16T02:37:02Z

JavacBench is a test program that compiles 90 Java source files. It uses a fair amount of invokedynamic callsites, so it's good for testing CDS support for indy and lambda expressions.

This test was first integrated into the leyden repo. Hence some of the files have copyrights in 2023.

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-8332340: Add JavacBench as a test case for CDS (Enhancement - P4)

Reviewers

Calvin Cheung (@calvinccheung - Reviewer) ⚠️ Review applies to ad97efa1
Matias Saavedra Silva (@matias9927 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19256

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2024-05-16T02:37:35Z

👋 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 · 2024-05-16T02:38:17Z

@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:

8332340: Add JavacBench as a test case for CDS

Reviewed-by: ccheung, matsaave

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 89 new commits pushed to the master branch:

90758f6: 8332808: Always set java.io.tmpdir to a suitable value in the build
e19a421: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
2581935: 8332528: Generate code in SwitchBootstraps.generateTypeSwitch that require fewer adaptations
b890336: 8328083: degrade virtual thread support for GetObjectMonitorUsage
4e6d851: 8325324: Implement JEP 477: Implicitly Declared Classes and Instance Main Methods (Third Preview)
612ae92: 8332735: [JVMCI] Add extra JVMCI events for exception translation
1ea76d3: 8332675: test/hotspot/jtreg/gc/testlibrary/Helpers.java compileClass javadoc does not match after 8321812
94af3c2: 8329203: Parallel: Investigate Mark-Compact for Full GC to decrease memory usage
1e5a278: 8332676: Remove unused BarrierSetAssembler::incr_allocated_bytes
c2180d1: 8315767: InetAddress: constructing objects from BSD literal addresses
... and 79 more: https://git.openjdk.org/jdk/compare/4083255440cfbf39b9683ea88a433d71ec6111e7...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.

openjdk · 2024-05-16T02:38:56Z

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

core-libs
hotspot-runtime

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

mlbridge · 2024-05-16T02:42:33Z

Webrevs

test/lib/jdk/test/lib/StringArrayUtils.java

liach · 2024-05-16T03:31:05Z

test/lib/jdk/test/lib/StringArrayUtils.java

+            list.add(s);
+        }
+
+        return list.toArray(new String[list.size()]);


I thought we have been preferring ot use new String[0] for toArray calls. Also for simplicity, we can change the implementation to:

var list = new ArrayList<>(Arrays.asList(prefix)); Collections.addAll(list, extra); return list.toArray(new String[0]);

or for performance:

String[] ret = new String[prefix.length + extra.length]; System.arraycopy(prefix, 0, ret, 0, prefix.length); System.arraycopy(extra, 0, ret, prefix.length, extra.length); return ret;

Thanks for the suggestion. I used your arraycopy version. I also added some javadocs about the intended use of these concat() methods.

…ocessBuilder() instead of createLimitedTestJavaProcessBuilder()

calvinccheung

A few minor comments.

calvinccheung · 2024-05-17T19:34:58Z

test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java

+
+import jdk.test.lib.cds.CDSAppTester;
+import jdk.test.lib.helpers.ClassFileInstaller;
+import jdk.test.lib.process.OutputAnalyzer;


Is this import needed?

calvinccheung · 2024-05-17T19:40:11Z

test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBenchApp.java

+        long elapsed = System.currentTimeMillis() - started;
+        if (System.getProperty("JavacBenchApp.silent") == null) {


Should line 221 be inside the 'if' block?

I moved it inside the 'if' block.

calvinccheung · 2024-05-17T19:43:13Z

test/lib/jdk/test/lib/cds/CDSAppTester.java

+            }
+        }
+
+        throw new RuntimeException("Must have exactly one command line argument: STATIC or DYNAMIC");


Why not check the number of args at the beginning of the method?

calvinccheung · 2024-05-17T19:45:00Z

test/hotspot/jtreg/runtime/cds/appcds/applications/JavacBench.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.


Since this is a new file, should the copyright year be only 2024?
(same for other files)

The file was first added in the Leyden repo in 2023, so I think we should use that as the initial copyright year.

calvinccheung

Updates look good. Thanks!

matias9927

LGTM, and thanks for the new utilities! That should make writing CDS tests a lot easier. I have a few style considerations but you can take them or leave them.

matias9927 · 2024-05-21T21:03:20Z

test/lib/jdk/test/lib/cds/CDSAppTester.java

+        return output;
+    }
+
+    private OutputAnalyzer dumpStaticArchive() throws Exception {


The code from 156 to 162 is repeated 3 times here, is it worth making another function for this?

Thanks for the suggestion. I've refactored the code a bit to make it easier to write new execution modes (which will be needed in Leyden).

test/lib/jdk/test/lib/cds/CDSAppTester.java

matias9927

Changes look good

iklam · 2024-05-23T16:01:13Z

Thanks @liach @calvinccheung @matias9927 for the review
/integrate

openjdk · 2024-05-23T16:04:59Z

Going to push as commit 7fd9d6c.
Since your change was applied there have been 91 commits pushed to the master branch:

417d174: 8331348: Some incremental builds deposit files in the make directory
303ac9f: 8332671: Logging for pretouching thread stacks shows wrong memory range
90758f6: 8332808: Always set java.io.tmpdir to a suitable value in the build
e19a421: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
2581935: 8332528: Generate code in SwitchBootstraps.generateTypeSwitch that require fewer adaptations
b890336: 8328083: degrade virtual thread support for GetObjectMonitorUsage
4e6d851: 8325324: Implement JEP 477: Implicitly Declared Classes and Instance Main Methods (Third Preview)
612ae92: 8332735: [JVMCI] Add extra JVMCI events for exception translation
1ea76d3: 8332675: test/hotspot/jtreg/gc/testlibrary/Helpers.java compileClass javadoc does not match after 8321812
94af3c2: 8329203: Parallel: Investigate Mark-Compact for Full GC to decrease memory usage
... and 81 more: https://git.openjdk.org/jdk/compare/4083255440cfbf39b9683ea88a433d71ec6111e7...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-05-23T16:05:04Z

@iklam Pushed as commit 7fd9d6c.

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

8332340: Add JavacBench as a test case for CDS

10cf69d

openjdk bot added the rfr Pull request is ready for review label May 16, 2024

openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels May 16, 2024

liach reviewed May 16, 2024

View reviewed changes

(1) comments from @liach; (2) added javadoc; (3) Use createTestJavaPr…

354665a

…ocessBuilder() instead of createLimitedTestJavaProcessBuilder()

calvinccheung reviewed May 17, 2024

View reviewed changes

@calvinccheung comments

ad97efa

calvinccheung approved these changes May 21, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 21, 2024

matias9927 approved these changes May 21, 2024

View reviewed changes

@matias9927 comments

be84efc

matias9927 approved these changes May 23, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label May 23, 2024

openjdk bot closed this May 23, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8332340: Add JavacBench as a test case for CDS #19256

8332340: Add JavacBench as a test case for CDS #19256

iklam commented May 16, 2024 •

edited by openjdk bot

bridgekeeper bot commented May 16, 2024

openjdk bot commented May 16, 2024 •

edited

openjdk bot commented May 16, 2024

mlbridge bot commented May 16, 2024 •

edited

liach May 16, 2024

iklam May 16, 2024

calvinccheung left a comment

calvinccheung May 17, 2024

iklam May 20, 2024

calvinccheung May 17, 2024

iklam May 20, 2024

calvinccheung May 17, 2024

iklam May 20, 2024

calvinccheung May 17, 2024

iklam May 20, 2024

calvinccheung left a comment

matias9927 left a comment

matias9927 May 21, 2024

iklam May 22, 2024

matias9927 left a comment

iklam commented May 23, 2024

openjdk bot commented May 23, 2024

openjdk bot commented May 23, 2024

		long elapsed = System.currentTimeMillis() - started;
		if (System.getProperty("JavacBenchApp.silent") == null) {

		@@ -0,0 +1,77 @@
		/*
		* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.

8332340: Add JavacBench as a test case for CDS #19256

8332340: Add JavacBench as a test case for CDS #19256

Conversation

iklam commented May 16, 2024 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented May 16, 2024

openjdk bot commented May 16, 2024 • edited

openjdk bot commented May 16, 2024

mlbridge bot commented May 16, 2024 • edited

Webrevs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

calvinccheung left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

calvinccheung left a comment

Choose a reason for hiding this comment

matias9927 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matias9927 left a comment

Choose a reason for hiding this comment

iklam commented May 23, 2024

openjdk bot commented May 23, 2024

openjdk bot commented May 23, 2024

iklam commented May 16, 2024 •

edited by openjdk bot

openjdk bot commented May 16, 2024 •

edited

mlbridge bot commented May 16, 2024 •

edited