Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master HEAD into openj9-staging #676

Merged
merged 54 commits into from
Oct 19, 2023

Conversation

JasonFengJ9
Copy link
Member

@JasonFengJ9 JasonFengJ9 commented Oct 17, 2023

Merge master HEAD into openj9-staging

Conflicts:

	test/jdk/java/foreign/NativeTestHelper.java

Modified

	src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java

Depends on

FYI @ChengJin01

Signed-off-by: Jason Feng fengj@ca.ibm.com

vamsi-parasa and others added 30 commits October 12, 2023 04:45
Reviewed-by: jbhateja, kvn, ihse, sviswanathan
…veDispatcher_getmntctl()

Reviewed-by: bpb, vtewari, rriggs
Reviewed-by: dfuchs, alanb
…ited events properly

Reviewed-by: tr, honkar, aivanov
…ava to handle default cases

Reviewed-by: mullan
Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Co-authored-by: Jorn Vernee <jvernee@openjdk.org>
Co-authored-by: Per Minborg <pminborg@openjdk.org>
Reviewed-by: dholmes, psandoz, mcimadamore, alanb
…ava on two platforms

8318040: ProblemList vmTestbase/nsk/monitoring/ThreadMXBean/findMonitorDeadlockedThreads/find006/TestDescription.java on macosx-aarch64
8318042: ProblemList java/nio/channels/vthread/BlockingChannelOps.java#direct-register with GenZGC

Reviewed-by: rriggs, azvegint
Reviewed-by: sspitsyn, cjplummer
… use getprocs64

Reviewed-by: rriggs, stuefe, mbaesken
Reviewed-by: erikj, prr, ihse, clanger
Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Co-authored-by: Per Minborg <pminborg@openjdk.org>
Reviewed-by: mcimadamore
…layouts (mainline)

Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Reviewed-by: mcimadamore
…morySegmentImpl

Co-authored-by: Jorn Vernee <jvernee@openjdk.org>
Reviewed-by: jvernee
…cOS 11 ARM

Reviewed-by: prr, azvegint, aivanov
shipilev and others added 16 commits October 16, 2023 08:00
…ency verification

Reviewed-by: vlivanov, stuefe, mli
Reviewed-by: jsjolen, gziemski, stuefe, mli
…y returns 'true' for FAT32 volume on macOS

Reviewed-by: alanb
Reviewed-by: cstein, asotona
Reviewed-by: sspitsyn, cjplummer
Skynet is a stress benchmark, which exceeds the below 4G capacity
of -Xcompressedrefs. The current workaround is to use
-Xnocompressedrefs where memory can be allocated outside the 4G
boundary.

To run Skynet with -Xcompressedrefs, the following features will be
needed:
- Move unmounted continuation stacks out of the low memory area.
- Improve performance of the sub-4G allocator so that it doesn't
  regress under high memory usage.

Depends on eclipse-openj9/openj9#18251

Related: eclipse-openj9/openj9#16728

Related: eclipse-openj9/openj9#15781

Signed-off-by: Babneet Singh <sbabneet@ca.ibm.com>
Run virtual/stress/Skynet with -Xnocompressedrefs
@keithc-ca
Copy link
Member

openjdk-tag.gmk should be updated for the new tag.

Conflicts:
	test/jdk/java/foreign/NativeTestHelper.java

Modified:
	src/java.base/share/classes/jdk/internal/foreign/abi/ppc64/aix/AixPPC64Linker.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@keithc-ca keithc-ca merged commit 457d8a3 into ibmruntimes:openj9-staging Oct 19, 2023
0 of 2 checks passed
@JasonFengJ9 JasonFengJ9 deleted the mergestaging branch October 19, 2023 13:57
@keithc-ca
Copy link
Member

Sorry, I missed or forgot about the dependency on eclipse-openj9/openj9#18296; rather than revert this, I'll prioritize getting the openj9 change merged.

@pshipton
Copy link
Member

It's only staging, which was broken anyway, not really a concern.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.