8300829: Make CtwRunner available as an independent tool by caojoshua · Pull Request #13344 · openjdk/jdk

caojoshua · 2023-04-05T04:46:21Z

~~Create an independent jar file with CtwRunner as the main class to make it easier to run~~. Not needed anymore thanks to @navyxliu 's comments. We can use the original ctw.jar because it already has ctwrunner class.
Output the class files directly into the destination directory. Currently, CTW expects a wb.jar, but the jtreg tests that use CTWRunner has class files outside of a jar.
Introduce sun.hotspot.tools.ctwrunner.ctw_extra_args option to pass extra arguments to CTW. Arguments are comma separated because working with spaces in bash can be kind of awkward, but I'm open to changing this part.

Motivation

CTWRunner is a wrapper around CTW that will continue compiling beyond failure. It can be useful for testing compilation with certain flags. For example, one could run

JAVA_OPTIONS="-Dsun.hotspot.tools.ctwrunner.ctw_extra_args=-XX:+StressLCM,-XX:+StressGCM" ./ctwrunner.sh modules:java.base

To test compiling the java.base module with -XX:+StressLCM -XX:+StressGCM. This is advantageous over uses CTW because we can see the full list of crashes for the entire module.

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-8300829: Make CtwRunner available as an independent tool

Reviewers

Xin Liu (@navyxliu - Committer) ⚠️ Review applies to 35979be8
Paul Hohensee (@phohensee - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13344

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-04-05T04:48:00Z

👋 Welcome back caojoshua! 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-04-05T04:50:01Z

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

hotspot-compiler

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-04-05T04:54:04Z

Webrevs

navyxliu · 2023-04-05T05:05:33Z

test/hotspot/jtreg/testlibrary/ctw/Makefile

+	$(JAR) --create --file=$@ --main-class $(CTW_MAIN_CLASS) -C $(OUTPUT_DIR) .
+	@rm -rf $(OUTPUT_DIR)
+
+$(DST_DIR)/ctwrunner.jar: filelist $(DST_DIR)/wb.jar


Theoretically, we can avoid from generating ctwrunner.jar. The classes are the same as 'ctw.jar' and the only different part is the entry point.

to launch CTWRunner, you can do thing like this in ctwruner.sh

echo '$${JAVA_HOME}/bin/java $${JAVA_OPTIONS} -Dtest.jdk=$${JAVA_HOME} -cp ctw.jar $CTWRUNNER_MAIN_CLASS $$@' > $@

it's up to you. if we generate ctwrunner.jar, we will have a "standalone" jar.

I removed ctwrunner.jar in newest commit.

I also realized I was javac'ing twice. We avoid this entirely by removing the extra jar.

navyxliu · 2023-04-05T05:11:44Z

test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java

+     * Value of {@code -Dsun.hotspot.tools.ctwrunner.ctw_extra_args}. Extra
+     * comma-separated arguments to pass to CTW subprocesses.
+     */
+    public static final String CTW_EXTRA_ARGS


how about you use getProperty("sun.hotspot.tools.ctwrunner.ctw_extra_args", "").
by giving it an empty string as default value, you can take iout if (null != CTW_EXTRA_ARGS) below.

btw, you may also need to update the year in the copyrights header.

Yup. Made these changes.

Better to make CTW_EXTRA_ARGS private. If it's needed outside this class, add a public accessor. Don't think it's needed outside though.

Made it private. Not needed outside.

navyxliu

LGTM. I am not a reviewer. need other reviewers to approve this.

phohensee

Lgtm.

openjdk · 2023-04-06T18:10:39Z

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

8300829: Make CtwRunner available as an independent tool

Reviewed-by: xliu, phh

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

0a34018: 8305680: Remove Permissions from jcmd help output
8db1dd0: 8305622: Remove Permission details from jcmd man page
1d517af: 8305209: JDWP exit error AGENT_ERROR_INVALID_THREAD(203): missing entry in running thread table
08fbb7b: 8272119: Typo in JDK documentation (a -> an)
536ad9d: 8305461: [vectorapi] Add VectorMask::xor
ddd50d0: 8305608: Change VMConnection to use "test.class.path"instead of "test.classes"
ce10460: 8274166: Some CDS tests ignore -Dtest.cds.runtime.options
e52a2ae: 8304745: Lazily initialize byte[] in java.io.BufferedInputStream
6580c4e: 8267140: Support closing the HttpClient by making it auto-closable
b5ea140: 8269843: typo in LinkedHashMap::removeEldestEntry spec
... and 24 more: https://git.openjdk.org/jdk/compare/15fa78e6e78942e6c33e071b5a9d4d85143bc822...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@navyxliu, @phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

caojoshua · 2023-04-06T22:39:59Z

/integrate

openjdk · 2023-04-06T22:41:36Z

@caojoshua
Your change (at version bed0c81) is now ready to be sponsored by a Committer.

phohensee · 2023-04-07T00:27:05Z

/sponsor

openjdk · 2023-04-07T00:28:14Z

Going to push as commit 314e9b3.
Since your change was applied there have been 34 commits pushed to the master branch:

0a34018: 8305680: Remove Permissions from jcmd help output
8db1dd0: 8305622: Remove Permission details from jcmd man page
1d517af: 8305209: JDWP exit error AGENT_ERROR_INVALID_THREAD(203): missing entry in running thread table
08fbb7b: 8272119: Typo in JDK documentation (a -> an)
536ad9d: 8305461: [vectorapi] Add VectorMask::xor
ddd50d0: 8305608: Change VMConnection to use "test.class.path"instead of "test.classes"
ce10460: 8274166: Some CDS tests ignore -Dtest.cds.runtime.options
e52a2ae: 8304745: Lazily initialize byte[] in java.io.BufferedInputStream
6580c4e: 8267140: Support closing the HttpClient by making it auto-closable
b5ea140: 8269843: typo in LinkedHashMap::removeEldestEntry spec
... and 24 more: https://git.openjdk.org/jdk/compare/15fa78e6e78942e6c33e071b5a9d4d85143bc822...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-04-07T00:28:25Z

@phohensee @caojoshua Pushed as commit 314e9b3.

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

8300829: Make CtwRunner available as an independent tool

3203737

openjdk bot added the rfr Pull request is ready for review label Apr 5, 2023

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Apr 5, 2023

navyxliu reviewed Apr 5, 2023

View reviewed changes

caojoshua added 2 commits April 5, 2023 18:51

Remove ctwrunner.jar and default value for CTW extra args

f63c6e7

Upgrade CTWRunner.java copyright header

35979be

navyxliu approved these changes Apr 6, 2023

View reviewed changes

caojoshua added 2 commits April 6, 2023 19:16

Make CTW_EXTRA_ARGS private

76f8434

Don't create unnecessary output dir

bed0c81

phohensee approved these changes Apr 6, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Apr 6, 2023

openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 6, 2023

openjdk bot added the integrated Pull request has been integrated label Apr 7, 2023

openjdk bot closed this Apr 7, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Apr 7, 2023

Conversation

caojoshua commented Apr 5, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Apr 5, 2023

Uh oh!

openjdk bot commented Apr 5, 2023

Uh oh!

mlbridge bot commented Apr 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

navyxliu Apr 5, 2023

Choose a reason for hiding this comment

Uh oh!

caojoshua Apr 5, 2023

Choose a reason for hiding this comment

Uh oh!

navyxliu Apr 5, 2023

Choose a reason for hiding this comment

Uh oh!

caojoshua Apr 5, 2023

Choose a reason for hiding this comment

Uh oh!

phohensee Apr 6, 2023

Choose a reason for hiding this comment

Uh oh!

caojoshua Apr 6, 2023

Choose a reason for hiding this comment

Uh oh!

navyxliu left a comment

Choose a reason for hiding this comment

Uh oh!

phohensee left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Apr 6, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

caojoshua commented Apr 6, 2023

Uh oh!

openjdk bot commented Apr 6, 2023

Uh oh!

phohensee commented Apr 7, 2023

Uh oh!

openjdk bot commented Apr 7, 2023

Uh oh!

openjdk bot commented Apr 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

caojoshua commented Apr 5, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Apr 5, 2023 •

edited

Loading

openjdk bot commented Apr 6, 2023 •

edited

Loading