8276799: Implementation of JEP 422: Linux/RISC-V Port #6294

RealFYang · 2021-11-08T11:17:47Z

This PR implements JEP 422: Linux/RISC-V Port [1].
The PR starts as a squashed merge of the https://openjdk.java.net/projects/riscv-port branch.

This has been tested with jtreg tier{1,2,3,4} and jcstress on HiFive Unmatched board. Dacapo, SPECjbb2015 and SPECjvm2008 benchmark tests are also carried out regularly. So it should be good enough to run most Java programs.

[1] https://openjdk.java.net/jeps/422

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8276799: Implementation of JEP 422: Linux/RISC-V Port

Reviewers

Magnus Ihse Bursie (@magicus - Reviewer) ⚠️ Review applies to 3340203
David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to b7a3172
Roger Riggs (@RogerRiggs - Reviewer) ⚠️ Review applies to b7a3172
Vladimir Kozlov (@vnkozlov - Reviewer) ⚠️ Review applies to d8bef7f
Aleksey Shipilev (@shipilev - Reviewer) ⚠️ Review applies to d8bef7f

Contributors

Yadong Wang <yadonn.wang@huawei.com>
Yanhong Zhu <zhuyanhong2@huawei.com>
Feilong Jiang <jiangfeilong@huawei.com>
Kun Wang <wangkun49@huawei.com>
Zhuxuan Ni <nizhuxuan@huawei.com>
Taiping Guo <guotaiping1@huawei.com>
Kang He <hekang6@huawei.com>
Aleksey Shipilev <shade@openjdk.org>
Xiaolin Zheng <yunyao.zxl@alibaba-inc.com>
Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Magnus Ihse Bursie <ihse@openjdk.org>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6294/head:pull/6294
$ git checkout pull/6294

Update a local copy of the PR:
$ git checkout pull/6294
$ git pull https://git.openjdk.java.net/jdk pull/6294/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6294

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6294.diff

bridgekeeper · 2021-11-08T11:18:23Z

👋 Welcome back fyang! 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 · 2021-11-08T11:20:13Z

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

build
core-libs
hotspot
serviceability
shenandoah

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.

RealFYang · 2021-11-09T07:49:06Z

/contributor add Yadong Wang yadonn.wang@huawei.com
/contributor add Yanhong Zhu zhuyanhong2@huawei.com
/contributor add Feilong Jiang jiangfeilong@huawei.com
/contributor add Kun Wang wangkun49@huawei.com
/contributor add Zhuxuan Ni nizhuxuan@huawei.com
/contributor add Taiping Guo guotaiping1@huawei.com
/contributor add Kang He hekang6@huawei.com
/contributor add shade

openjdk · 2021-11-09T07:49:28Z

@RealFYang
Contributor Yadong Wang <yadonn.wang@huawei.com> successfully added.

openjdk · 2021-11-09T07:50:40Z

@RealFYang
Contributor Yanhong Zhu <zhuyanhong2@huawei.com> successfully added.

openjdk · 2021-11-09T07:51:43Z

@RealFYang
Contributor Feilong Jiang <jiangfeilong@huawei.com> successfully added.

openjdk · 2021-11-09T07:52:56Z

@RealFYang
Contributor Kun Wang <wangkun49@huawei.com> successfully added.

openjdk · 2021-11-09T07:55:59Z

@RealFYang
Contributor Zhuxuan Ni <nizhuxuan@huawei.com> successfully added.

openjdk · 2021-11-09T07:57:07Z

@RealFYang
Contributor Taiping Guo <guotaiping1@huawei.com> successfully added.

openjdk · 2021-11-09T07:59:27Z

@RealFYang
Contributor Kang He <hekang6@huawei.com> successfully added.

openjdk · 2021-11-09T08:01:53Z

@RealFYang
Contributor Aleksey Shipilev <shade@openjdk.org> successfully added.

openjdk · 2021-11-20T13:51:12Z

@RealFYang
Contributor Xiaolin Zheng <yunyao.zxl@alibaba-inc.com> successfully added.

openjdk · 2021-12-11T13:33:51Z

@RealFYang
Contributor Kuai Wei <kuaiwei.kw@alibaba-inc.com> successfully added.

bridgekeeper · 2022-01-24T04:33:40Z

@RealFYang This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

RealFYang · 2022-01-24T06:34:31Z

Rebased to master

bridgekeeper · 2022-02-21T10:45:35Z

@RealFYang This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

magicus · 2022-03-21T14:55:58Z

/reviewers 3 reviewer

openjdk · 2022-03-21T14:56:43Z

@magicus Usage: /reviewers <n> [<role>] where <n> is the number of required reviewers. If role is set, the reviewers need to have that project role. If omitted, role defaults to authors.
Number of required reviewers of role reviewers cannot be decreased below 4

dholmes-ora

Hi,

I've looked at everything that is not a RISC-V specific file, except for the C1 changes as the compiler folk will need to approve those.

Some copyrights will need updating to 2022 on the Oracle copyright line please.

I have flagged one issue in regard to C++ atomics - see below.

Thanks,
David

make/autoconf/libraries.m4

RealFYang · 2022-03-22T11:46:46Z

Build changes look good. I can't say anything about the rest of the code.

/reviewers 3

Thanks again for looking at the build changes :-)

RealFYang · 2022-03-22T11:50:33Z

Hi,

I've looked at everything that is not a RISC-V specific file, except for the C1 changes as the compiler folk will need to approve those.

Some copyrights will need updating to 2022 on the Oracle copyright line please.

Hi David,
I have pushed one more commit updating the Oralce copyright line for existing files touched.
Thanks for looking at this.

RogerRiggs

The test/jdk files look ok. (I didn't look at the rest)

vnkozlov

I looked on C1/C2 changes and compiler tests. Seems reasonable.
But before approval I would need to run changes through our testing.

src/hotspot/cpu/riscv/disassembler_riscv.hpp

RealFYang · 2022-03-23T01:56:14Z

The test/jdk files look ok. (I didn't look at the rest)

Thank you for looking at that part.

vnkozlov

Update looks good.
Testing results are also good.

shipilev

Looks okay to me.

RealFYang · 2022-03-24T06:57:22Z

@vnkozlov @shipilev : Thanks for reviewing this :-)

RealFYang · 2022-03-24T09:21:22Z

/integrate

openjdk · 2022-03-24T09:23:03Z

Going to push as commit 5905b02.
Since your change was applied there have been 2 commits pushed to the master branch:

b05d4cc: 8283350: (tz) Update Timezone Data to 2022a
a35afe8: 8283519: Hsdis with capstone should annotate output

Your commit was automatically rebased without conflicts.

openjdk · 2022-03-24T09:23:22Z

@RealFYang Pushed as commit 5905b02.

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

libffi offers to APIs for preparing a native call: https://github.com/libffi/libffi/blob/5dcb741f1544c5e18c9dbf96aeb8b61cc556a616/src/prep_cif.c#L221-L235 The latter (`ffi_prep_cif_var`) is ought to be used for variadic functions. In practice we only ever used `ffi_prep_cif` as it didn't matter so far, because the underlying implementation only differs if `FFI_TARGET_SPECIFIC_VARIADIC` is defined: https://github.com/libffi/libffi/blob/5dcb741f1544c5e18c9dbf96aeb8b61cc556a616/src/prep_cif.c#L211-L215 And that wasn't relevant until darwin-aarch64: https://github.com/libffi/libffi/blob/5dcb741f1544c5e18c9dbf96aeb8b61cc556a616/src/aarch64/ffitarget.h#L79 Bonus: It's also needed for linux-riscv: https://github.com/libffi/libffi/blob/5dcb741f1544c5e18c9dbf96aeb8b61cc556a616/src/riscv/ffitarget.h#L66 OpenJDK support has landed recently, so we might care about linux-riscv "soon" ;-) openjdk/jdk#6294 ------------------------------------------------------------------------ The infrastructure to use `ffi_prep_cif_var` is actually there, but since we didn't include the ellipsis in the signature it didn't propgate down through the SignatureBuilder.

sunny868 · 2023-02-17T01:34:40Z

src/hotspot/cpu/riscv/riscv.ad

+instruct cmpU_loop(cmpOpU cmp, iRegI op1, iRegI op2, label lbl)
+%{
+  // Same match rule as `far_cmpU_loop'.
+  match(CountedLoopEnd cmp (CmpU op1 op2));


Which testcases can test this instruct and the following instructs?
match(CountedLoopEnd cmp (CmpP op1 op2));
match(CountedLoopEnd cmp (CmpN op1 op2));
match(CountedLoopEnd cmp (CmpF op1 op2));
match(CountedLoopEnd cmp (CmpD op1 op2));

I suspect this instruction is useless.

openjdk · 2023-02-17T01:35:12Z

@magicus The command reviewers can only be used in open pull requests.

openjdk bot added serviceability serviceability-dev@openjdk.org build build-dev@openjdk.org hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Nov 8, 2021

RealFYang force-pushed the JDK-8276799 branch from a19a1ff to 2f89b96 Compare November 20, 2021 02:49

RealFYang changed the title ~~8276799: Implementation of JEP XXX: Linux/RISC-V Port~~ 8276799: Implementation of JEP 422: Linux/RISC-V Port Nov 20, 2021

This comment has been minimized.

Sign in to view

RealFYang force-pushed the JDK-8276799 branch from 2f89b96 to 668d7ef Compare November 29, 2021 02:09

RealFYang force-pushed the JDK-8276799 branch from 668d7ef to a68980f Compare December 11, 2021 13:30

This comment has been minimized.

Sign in to view

RealFYang force-pushed the JDK-8276799 branch from a68980f to 299b3ee Compare December 27, 2021 03:11

RealFYang force-pushed the JDK-8276799 branch from 299b3ee to 00c43fc Compare January 24, 2022 03:20

RealFYang force-pushed the JDK-8276799 branch from 00c43fc to ced5ef4 Compare January 30, 2022 09:17

openjdk bot added the ready Pull request is ready to be integrated label Mar 21, 2022

Merge remote-tracking branch 'upstream/master' into JDK-8276799

a144cd2

dholmes-ora approved these changes Mar 22, 2022

View reviewed changes

make/autoconf/libraries.m4 Outdated Show resolved Hide resolved

Address review comments

b7a3172

dholmes-ora approved these changes Mar 22, 2022

View reviewed changes

RogerRiggs approved these changes Mar 22, 2022

View reviewed changes

vnkozlov reviewed Mar 22, 2022

View reviewed changes

src/hotspot/cpu/riscv/disassembler_riscv.hpp Outdated Show resolved Hide resolved

Fix copyright header

d8bef7f

vnkozlov approved these changes Mar 23, 2022

View reviewed changes

shipilev approved these changes Mar 23, 2022

View reviewed changes

Merge remote-tracking branch 'upstream/master' into JDK-8276799

90db70e

openjdk bot added the integrated Pull request has been integrated label Mar 24, 2022

openjdk bot closed this Mar 24, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 24, 2022

RealFYang deleted the JDK-8276799 branch March 24, 2022 09:32

sunny868 reviewed Feb 17, 2023

View reviewed changes

shipilev mentioned this pull request Jul 4, 2023

8276799: Implementation of JEP 422: Linux/RISC-V Port openjdk/jdk17u-dev#1427

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8276799: Implementation of JEP 422: Linux/RISC-V Port #6294

8276799: Implementation of JEP 422: Linux/RISC-V Port #6294

RealFYang commented Nov 8, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 8, 2021

openjdk bot commented Nov 8, 2021

RealFYang commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

This comment has been minimized.

openjdk bot commented Nov 20, 2021

This comment has been minimized.

openjdk bot commented Dec 11, 2021

bridgekeeper bot commented Jan 24, 2022

RealFYang commented Jan 24, 2022

bridgekeeper bot commented Feb 21, 2022

magicus commented Mar 21, 2022

openjdk bot commented Mar 21, 2022

dholmes-ora left a comment

RealFYang commented Mar 22, 2022

RealFYang commented Mar 22, 2022

RogerRiggs left a comment

vnkozlov left a comment

RealFYang commented Mar 23, 2022

vnkozlov left a comment

shipilev left a comment

RealFYang commented Mar 24, 2022

RealFYang commented Mar 24, 2022

openjdk bot commented Mar 24, 2022

openjdk bot commented Mar 24, 2022

sunny868 Feb 17, 2023

openjdk bot commented Feb 17, 2023

8276799: Implementation of JEP 422: Linux/RISC-V Port #6294

8276799: Implementation of JEP 422: Linux/RISC-V Port #6294

Conversation

RealFYang commented Nov 8, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Contributors

Reviewing

bridgekeeper bot commented Nov 8, 2021

openjdk bot commented Nov 8, 2021

RealFYang commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

openjdk bot commented Nov 9, 2021

This comment has been minimized.

openjdk bot commented Nov 20, 2021

This comment has been minimized.

openjdk bot commented Dec 11, 2021

bridgekeeper bot commented Jan 24, 2022

RealFYang commented Jan 24, 2022

bridgekeeper bot commented Feb 21, 2022

magicus commented Mar 21, 2022

openjdk bot commented Mar 21, 2022

dholmes-ora left a comment

Choose a reason for hiding this comment

RealFYang commented Mar 22, 2022

RealFYang commented Mar 22, 2022

RogerRiggs left a comment

Choose a reason for hiding this comment

vnkozlov left a comment

Choose a reason for hiding this comment

RealFYang commented Mar 23, 2022

vnkozlov left a comment

Choose a reason for hiding this comment

shipilev left a comment

Choose a reason for hiding this comment

RealFYang commented Mar 24, 2022

RealFYang commented Mar 24, 2022

openjdk bot commented Mar 24, 2022

openjdk bot commented Mar 24, 2022

sunny868 Feb 17, 2023

Choose a reason for hiding this comment

openjdk bot commented Feb 17, 2023

RealFYang commented Nov 8, 2021 •

edited by openjdk bot

Loading