8385743: [lworld] investigate and address build related comments in the Valhalla PR#2541
8385743: [lworld] investigate and address build related comments in the Valhalla PR#2541dcubed-ojdk wants to merge 2 commits into
Conversation
|
👋 Welcome back dcubed! A progress list of the required criteria for merging this PR into |
| JVM_HEAP_LIMIT_32="768" | ||
| # Running a 64 bit JVM allows for and requires a bigger heap | ||
| JVM_HEAP_LIMIT_64="3200" | ||
| JVM_HEAP_LIMIT_64="2048" |
There was a problem hiding this comment.
| # Use hard-coded values for java flags (one size, fits all!) | ||
| JAVA_FLAGS := -Duser.language=en -Duser.country=US | ||
| JAVA_FLAGS_BIG := -Xms64M -Xmx3200M | ||
| JAVA_FLAGS_BIG := -Xms64M -Xmx2048M |
There was a problem hiding this comment.
|
@dcubed-ojdk 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: 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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
| JVM_EXCLUDE_FILES += templateInterpreter.cpp templateInterpreterGenerator.cpp \ | ||
| bcEscapeAnalyzer.cpp ciTypeFlow.cpp macroAssembler_common.cpp | ||
| JVM_CFLAGS_FEATURES += -DZERO -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS) | ||
| JVM_EXCLUDE_FILES += templateInterpreter.cpp \ | ||
| templateInterpreterGenerator.cpp bcEscapeAnalyzer.cpp ciTypeFlow.cpp \ | ||
| macroAssembler_common.cpp | ||
| JVM_CFLAGS_FEATURES += -DZERO \ | ||
| -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS) |
There was a problem hiding this comment.
| # Generate the value class replacements for selected java.base source files | ||
|
|
||
| java.base-VALUE_CLASS-REPLACEMENTS := \ | ||
| JAVA_BASE_VALUE_CLASS_REPLACEMENTS := \ |
There was a problem hiding this comment.
| VARHANDLE_$1_type := $$(strip $$(if $$(filter $(VARHANDLE_OBJECT_TYPES), $1), Object, $1)) | ||
| VARHANDLE_$1_InputType := $$(strip $$(if $$(filter $(VARHANDLE_OBJECT_TYPES), $1), $1, $$(call Conv, $1, Type))) | ||
| VARHANDLE_$1_Type := $$(strip $$(subst NonAtomicReference, Reference, $$(subst NonAtomicFlatValue, FlatValue, $$(VARHANDLE_$1_InputType)))) | ||
| VARHANDLE_$1_type := \ | ||
| $$(strip $$(if $$(filter $(VARHANDLE_OBJECT_TYPES), $1), Object, $1)) | ||
| VARHANDLE_$1_InputType := \ | ||
| $$(strip $$(if $$(filter $(VARHANDLE_OBJECT_TYPES), $1), $1, \ | ||
| $$(call Conv, $1, Type))) | ||
| VARHANDLE_$1_Type := \ | ||
| $$(strip $$(subst NonAtomicReference, Reference, \ | ||
| $$(subst NonAtomicFlatValue, FlatValue, $$(VARHANDLE_$1_InputType)))) |
There was a problem hiding this comment.
| # valueClassPlugin.jar -- contains ValueClassPlugin (a javac Plugin that | ||
| # rewrites @AsValueClass classes to value classes | ||
| # at parse time) together with @AsValueClass and | ||
| # the META-INF service descriptor, compiled WITH | ||
| # --enable-preview and the required internal-API | ||
| # exports. | ||
| # valueClassPlugin.jar -- Contains ValueClassPlugin (a javac Plugin that | ||
| # rewrites @AsValueClass classes to value classes at parse time) together | ||
| # with @AsValueClass and the META-INF service descriptor, compiled WITH | ||
| # --enable-preview and the required internal-API exports. |
There was a problem hiding this comment.
| include MakeFileEnd.gmk No newline at end of file | ||
| include MakeFileEnd.gmk |
There was a problem hiding this comment.
This puzzled me for a minute, then I remembered that the original file was missing an at the end.
| HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \ | ||
| JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \ | ||
| DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview restricted varargs dangling-doc-comments, \ | ||
| DISABLED_WARNINGS := preview, \ |
There was a problem hiding this comment.
| # Temporarily compile preview classes into a separate directory, and then | ||
| # copy into the correct output path location. | ||
| # We cannot compile directly into the desired directory because it's the | ||
| # compiler which creates the original '<module>/<classpath>/...' hierarchy. | ||
| # Compile preview classes into a separate directory, and then copy into the | ||
| # correct output path location. We cannot compile directly into the desired | ||
| # directory because it's the compiler which creates the original | ||
| # '<module>/<classpath>/...' hierarchy. |
There was a problem hiding this comment.
See https://bugs.openjdk.org/browse/JDK-8385743?focusedId=14884574&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-14884574 for the gory details.
Several of @erikj79's comments were resolved by another fix.
|
@liach - Thanks for the review! |
I've taken a pass at resolving most of @erikj79's build related comments in the Valhalla PR:
JDK-8317279 Standard library implementation of value classes and objects
openjdk/jdk#31123
A couple of the comments will be handled by separate issues:
In this PR, I have reverted two of @MrSimms' heap sizes of 3200 to the main-line's 2048.
I am testing this change with a Mach5 Tier[1-8]. Mach5 Tier[123458] have completed
and there are no related test or task failures. Mach5 Tier[67] are still executing and
are currently waiting for Mach5 resources.
Update: I have added links to the comments in JDK-8317279 that discuss my analysis
of the original code, where it came from and my proposed fix; gory details as it were.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/valhalla.git pull/2541/head:pull/2541$ git checkout pull/2541Update a local copy of the PR:
$ git checkout pull/2541$ git pull https://git.openjdk.org/valhalla.git pull/2541/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2541View PR using the GUI difftool:
$ git pr show -t 2541Using diff file
Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/2541.diff
Using Webrev
Link to Webrev Comment