8293474: RISC-V: Unify the way of moving function pointer #33

DingliZhang · 2024-09-27T02:51:15Z

Please review this backport to riscv-port-jdk11u.
Backport of JDK-8293474.
Applies not cleanly due to context difference, and changes in shenandoahBarrierSetAssembler_riscv.cpp have been modified previously.

Testing:

Tier1 passed without new failure on lp4a (release).

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-8293474: RISC-V: Unify the way of moving function pointer (Enhancement - P4)

Reviewers

Gui Cao (@zifeihan - Committer)
Fei Yang (@RealFYang - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/riscv-port-jdk11u.git pull/33/head:pull/33
$ git checkout pull/33

Update a local copy of the PR:
$ git checkout pull/33
$ git pull https://git.openjdk.org/riscv-port-jdk11u.git pull/33/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 33

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/riscv-port-jdk11u/pull/33.diff

Webrev

Link to Webrev Comment

bridgekeeper · 2024-09-27T02:51:47Z

👋 Welcome back dzhang! A progress list of the required criteria for merging this PR into riscv-port 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-09-27T02:51:58Z

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

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

8293474: RISC-V: Unify the way of moving function pointer

Reviewed-by: gcao, fyang

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 15 new commits pushed to the riscv-port branch:

7c55d32: Merge branch 'master' into riscv-port
a754a3d: 8339644: Improve parsing of Day/Month in tzdata rules
6436749: Merge
82c330b: 8341059: Change Entrust TLS distrust date to November 12, 2024
217b9fd: 8341057: Add 2 SSL.com TLS roots
2232d1f: 8338402: GHA: some of bundles may not get removed
06d87ca: 8299254: Support dealing with standard assert macro
0157967: 8316193: jdk/jfr/event/oldobject/TestListenerLeak.java java.lang.Exception: Could not find leak
bec83f3: 8211920: Close server socket and cleanups in test/jdk/javax/naming/module/RunBasic.java
59b3859: 8340815: Add SECURITY.md file
... and 5 more: https://git.openjdk.org/riscv-port-jdk11u/compare/120e35ec81814eab5b178c81a3790690b5dd7537...riscv-port

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 riscv-port branch, type /integrate in a new comment.

openjdk · 2024-09-27T02:52:14Z

This backport pull request has now been updated with issue from the original commit.

mlbridge · 2024-09-27T02:56:24Z

Webrevs

00: Full (7464b894)

zifeihan

Looks good.

DingliZhang · 2024-10-09T11:04:56Z

Thanks all for the review.
/integrate

openjdk · 2024-10-09T11:06:31Z

Going to push as commit d46c73c.
Since your change was applied there have been 15 commits pushed to the riscv-port branch:

7c55d32: Merge branch 'master' into riscv-port
a754a3d: 8339644: Improve parsing of Day/Month in tzdata rules
6436749: Merge
82c330b: 8341059: Change Entrust TLS distrust date to November 12, 2024
217b9fd: 8341057: Add 2 SSL.com TLS roots
2232d1f: 8338402: GHA: some of bundles may not get removed
06d87ca: 8299254: Support dealing with standard assert macro
0157967: 8316193: jdk/jfr/event/oldobject/TestListenerLeak.java java.lang.Exception: Could not find leak
bec83f3: 8211920: Close server socket and cleanups in test/jdk/javax/naming/module/RunBasic.java
59b3859: 8340815: Add SECURITY.md file
... and 5 more: https://git.openjdk.org/riscv-port-jdk11u/compare/120e35ec81814eab5b178c81a3790690b5dd7537...riscv-port

Your commit was automatically rebased without conflicts.

openjdk · 2024-10-09T11:06:37Z

@DingliZhang Pushed as commit d46c73c.

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

andreas-schwab · 2024-10-09T18:51:22Z

This is causing a crash during boostrap, please revert.

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  Internal Error (output.cpp:1491), pid=174079, tid=174883
#  guarantee((int)(blk_starts[i+1] - blk_starts[i]) >= (current_offset - blk_offset)) failed: shouldn't increase block size
#
# JRE version: OpenJDK Runtime Environment (11.0.24+8) (build 11.0.24+8-suse-370.1-riscv64)
# Java VM: OpenJDK 64-Bit Server VM (11.0.24+8-suse-370.1-riscv64, mixed mode, tiered, compressed oops, g1 gc, linux-riscv64)
# Core dump will be written. Default location: /.build/cores/174079
#
# An error report file with more information is saved as:
# /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/make/hs_err_pid174079.log
[thread 174088 also had an error]
#
# Compiler replay data is saved as:
# /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/make/replay_pid174079.log
#
# If you would like to submit a bug report, please visit:
#   https://bugreport.java.com/bugreport/crash.jsp
#
/usr/bin/bash: line 1: 174079 Aborted                 /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/jdk/bin/jlink -J-Djlink.debug=true --module-path /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/images/jmods --endian little --release-info /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/jdk/release --order-resources=**module-info.class,@/home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/link_opt/classlist,/java.base/java/**,/java.base/jdk/**,/java.base/sun/**,/java.base/com/**,/jdk.localedata/** --dedup-legal-notices=error-if-not-same-content --generate-jli-classes=@/home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/link_opt/default_jli_trace.txt --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.attach,jdk.charsets,jdk.compiler,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.editpad,jdk.hotspot.agent,jdk.httpserver,jdk.internal.ed,jdk.internal.jvmstat,jdk.internal.le,jdk.internal.opt,jdk.jartool,jdk.javadoc,jdk.jcmd,jdk.jconsole,jdk.jdeps,jdk.jdi,jdk.jdwp.agent,jdk.jfr,jdk.jlink,jdk.jshell,jdk.jsobject,jdk.jstatd,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.ldap,jdk.naming.rmi,jdk.net,jdk.pack,jdk.rmic,jdk.scripting.nashorn,jdk.scripting.nashorn.shell,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,jdk.zipfs --output /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/images/jdk > >(/usr/bin/tee -a /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/images/jdk.log) 2> >(/usr/bin/tee -a /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/images/jdk.log 1>&2)

andreas-schwab · 2024-10-10T06:05:07Z

With slowdebug:

 1894	Epilog	===  [[]]   [-2147234809]
# pop frame 112
	add  sp, sp, #112
	ld  ra, [sp,#-16]
	ld  fp, [sp,#-8]
	# touch polling page
	li  t0, #0x7f4cb960e000
	ld  zr, [t0] n_size (272), current_offset (1316), instr_offset (1036)
Could not load hsdis-riscv64.so; library not loadable; PrintAssembly is disabled
 ------------------- 
# To suppress the following error report, specify this argument
# after -XX: or in .hotspotrc:  SuppressErrorAt=/output.cpp:1416
#
# A fatal error has been detected by the Java Runtime Environment:
#
#  Internal Error (/home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/src/hotspot/share/opto/output.cpp:1416), pid=366339, tid=366381
#  assert(false) failed: wrong size of mach node

DingliZhang · 2024-10-10T06:15:33Z

This is causing a crash during boostrap, please revert.

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  Internal Error (output.cpp:1491), pid=174079, tid=174883
#  guarantee((int)(blk_starts[i+1] - blk_starts[i]) >= (current_offset - blk_offset)) failed: shouldn't increase block size
#
# JRE version: OpenJDK Runtime Environment (11.0.24+8) (build 11.0.24+8-suse-370.1-riscv64)
# Java VM: OpenJDK 64-Bit Server VM (11.0.24+8-suse-370.1-riscv64, mixed mode, tiered, compressed oops, g1 gc, linux-riscv64)
# Core dump will be written. Default location: /.build/cores/174079
#
# An error report file with more information is saved as:
# /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/make/hs_err_pid174079.log
[thread 174088 also had an error]
#
# Compiler replay data is saved as:
# /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/make/replay_pid174079.log
#
# If you would like to submit a bug report, please visit:
#   https://bugreport.java.com/bugreport/crash.jsp
#
/usr/bin/bash: line 1: 174079 Aborted                 /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/jdk/bin/jlink -J-Djlink.debug=true --module-path /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/images/jmods --endian little --release-info /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/jdk/release --order-resources=**module-info.class,@/home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/link_opt/classlist,/java.base/java/**,/java.base/jdk/**,/java.base/sun/**,/java.base/com/**,/jdk.localedata/** --dedup-legal-notices=error-if-not-same-content --generate-jli-classes=@/home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/link_opt/default_jli_trace.txt --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.accessibility,jdk.attach,jdk.charsets,jdk.compiler,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,jdk.editpad,jdk.hotspot.agent,jdk.httpserver,jdk.internal.ed,jdk.internal.jvmstat,jdk.internal.le,jdk.internal.opt,jdk.jartool,jdk.javadoc,jdk.jcmd,jdk.jconsole,jdk.jdeps,jdk.jdi,jdk.jdwp.agent,jdk.jfr,jdk.jlink,jdk.jshell,jdk.jsobject,jdk.jstatd,jdk.localedata,jdk.management,jdk.management.agent,jdk.management.jfr,jdk.naming.dns,jdk.naming.ldap,jdk.naming.rmi,jdk.net,jdk.pack,jdk.rmic,jdk.scripting.nashorn,jdk.scripting.nashorn.shell,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,jdk.zipfs --output /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/images/jdk > >(/usr/bin/tee -a /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/images/jdk.log) 2> >(/usr/bin/tee -a /home/abuild/rpmbuild/BUILD/jdk11u-jdk-11.0.24-8/build/support/images/jdk.log 1>&2)

I use this as bootjdk and compiled on the commit d46c73c4d90670a06f8351bde444a3f4e5c0fc41 using the following command:

bash configure \
--disable-warnings-as-errors \
--with-boot-jdk=/home/dingli/jdk-bin/openjdk-11/jdk

time make bootcycle-images

It can be built successfully.

Could you please try the same bootjdk ? Also can you give reproduction conditions? Thanks a lot.

andreas-schwab · 2024-10-10T06:35:01Z

https://build.opensuse.org/package/live_build_log/home:Andreas_Schwab:riscv:java:test/java-11-openjdk/standard/riscv64

8293474: RISC-V: Unify the way of moving function pointer

7464b89

openjdk bot changed the title ~~Backport fc5f97fe379825cb927666ae26aef00082cfae56~~ 8293474: RISC-V: Unify the way of moving function pointer Sep 27, 2024

openjdk bot added backport rfr Pull request is ready for review labels Sep 27, 2024

zifeihan approved these changes Oct 8, 2024

View reviewed changes

RealFYang approved these changes Oct 9, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 9, 2024

openjdk bot added the integrated Pull request has been integrated label Oct 9, 2024

openjdk bot closed this Oct 9, 2024

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

DingliZhang mentioned this pull request Oct 15, 2024

Revert "8293474: RISC-V: Unify the way of moving function pointer" #41

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8293474: RISC-V: Unify the way of moving function pointer #33

8293474: RISC-V: Unify the way of moving function pointer #33

Uh oh!

DingliZhang commented Sep 27, 2024 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Sep 27, 2024

Uh oh!

openjdk bot commented Sep 27, 2024 •

edited

Loading

Uh oh!

openjdk bot commented Sep 27, 2024

Uh oh!

mlbridge bot commented Sep 27, 2024

Uh oh!

zifeihan left a comment

Uh oh!

DingliZhang commented Oct 9, 2024

Uh oh!

openjdk bot commented Oct 9, 2024

Uh oh!

openjdk bot commented Oct 9, 2024

Uh oh!

andreas-schwab commented Oct 9, 2024 •

edited by RealFYang

Loading

Uh oh!

andreas-schwab commented Oct 10, 2024 •

edited by DingliZhang

Loading

Uh oh!

DingliZhang commented Oct 10, 2024

Uh oh!

andreas-schwab commented Oct 10, 2024

Uh oh!

Uh oh!

8293474: RISC-V: Unify the way of moving function pointer #33

8293474: RISC-V: Unify the way of moving function pointer #33

Uh oh!

Conversation

DingliZhang commented Sep 27, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Sep 27, 2024

Uh oh!

openjdk bot commented Sep 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Sep 27, 2024

Uh oh!

mlbridge bot commented Sep 27, 2024

Webrevs

Uh oh!

zifeihan left a comment

Choose a reason for hiding this comment

Uh oh!

DingliZhang commented Oct 9, 2024

Uh oh!

openjdk bot commented Oct 9, 2024

Uh oh!

openjdk bot commented Oct 9, 2024

Uh oh!

andreas-schwab commented Oct 9, 2024 • edited by RealFYang Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andreas-schwab commented Oct 10, 2024 • edited by DingliZhang Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DingliZhang commented Oct 10, 2024

Uh oh!

andreas-schwab commented Oct 10, 2024

Uh oh!

Uh oh!

DingliZhang commented Sep 27, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Sep 27, 2024 •

edited

Loading

andreas-schwab commented Oct 9, 2024 •

edited by RealFYang

Loading

andreas-schwab commented Oct 10, 2024 •

edited by DingliZhang

Loading