Turn on nestmates spec #2270

tajila · 2018-06-26T14:51:18Z

Turn on nestmates spec

Signed-off-by: tajila [email protected]

keithc-ca · 2018-06-26T16:40:31Z

Does something need to be updated for the cmake build process?

tajila · 2018-06-26T16:56:53Z

I added a cmake cache variable for opt_valhalla_nestmates

pshipton · 2018-06-27T02:54:48Z

jenkins test sanity

pshipton · 2018-06-27T03:08:25Z

Turning this on will affect all versions of Java. It could affect the footprint of Java 8. Has there been any footprint analysis or performance analysis done for Java 8?

Since the ROMClass format is changed, the shared classes generation number needs to be modified when opt_valhallaNestmates is enabled.

It seems all #if defined(J9VM_OPT_VALHALLA_NESTMATES) should also check the Java version (JAVA_SPEC_VERSION) to avoid affecting early versions of Java which don't need these changes.

pshipton · 2018-06-27T03:13:19Z

It seems buildenv/jenkins/jobs/pull-requests/PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates should be deleted as well.

keithc-ca · 2018-06-27T11:17:32Z

It might make sense to simply remove J9VM_OPT_VALHALLA_NESTMATES in favour of

#if JAVA_SPEC_VERSION >= 11 /* nest-mates */

pshipton · 2018-06-27T11:53:25Z

or add something like the following rather than turning on the flag in all the spec files.

#if JAVA_SPEC_VERSION >= 11
#define J9VM_OPT_VALHALLA_NESTMATES 
#endif

keithc-ca · 2018-06-27T12:21:57Z

@pshipton I like that suggestion even better, but I still think the UMA property should be removed.

tajila · 2018-06-29T18:41:24Z

@pshipton I've updated the PR

pshipton · 2018-06-29T19:16:41Z

runtime/shared_common/OSCache.hpp

@@ -61,7 +61,7 @@
 #define OSCACHE_LOWEST_ACTIVE_GEN 1

 /* Always increment this value by 2. For testing we use the (current generation - 1) and expect the cache contents to be compatible. */
-#define OSCACHE_CURRENT_CACHE_GEN 35
+#define OSCACHE_CURRENT_CACHE_GEN 37


We need a different generation number when J9VM_OPT_VALHALLA_NESTMATES is defined, since the ROMClass format is different.

These functions also need to be modified to understand the new generation number. Its been suggested to change them to use if statements rather than a switch so they don't need to be changed again in the future.

SH_OSCache::getHeaderFieldOffsetForGen
SH_OSCacheFile::getMmapHeaderFieldOffsetForGen
SH_OSCachesysv::getSysvHeaderFieldOffsetForGen

pshipton · 2018-06-29T19:16:45Z

runtime/jcl/uma/se9_exports.xml

-	<export name="Java_java_lang_Class_getNestMembersImpl">
-		<include-if condition="spec.flags.opt_valhallaNestmates" />
-	</export>
+	<export name="Java_java_lang_Class_getNestHostImpl"/>


This isn't going to compile/link on Windows without a definition of the function.

pshipton · 2018-06-29T19:18:12Z

@AdamBrousseau what else is required to disable the PullRequest-Sanity-JDK11-linux_ppc-64_cmprssptrs_le_valhalla_nestmates build besides removing the files? Do we need to sync any changes?

keithc-ca · 2018-06-29T19:41:35Z

runtime/jcl/uma/se9_exports.xml

-		<include-if condition="spec.flags.opt_valhallaNestmates" />
-	</export>
+	<export name="Java_java_lang_Class_getNestHostImpl"/>
+	<export name="Java_java_lang_Class_getNestMembersImpl"/>


These should be moved to se11_exports.xml for inclusion only in Java 11 (or newer). You should expect link errors in earlier version because you can't export functions that don't exist.

AdamBrousseau · 2018-07-06T17:05:08Z

We can archive/disable the Jenkins build(s), that should be all.

keithc-ca · 2018-07-06T17:41:16Z

runtime/jcl/uma/se11_exports.xml

@@ -0,0 +1,25 @@
+<!-- 
+	Copyright (c) 2018, 2018 IBM Corp. and others


Can you remove the unnecessary indentation of this copyright notice and trim trailing whitespace, please?

keithc-ca · 2018-07-09T17:00:39Z

runtime/shared_common/OSCache.hpp

 #define OSCACHE_CURRENT_CACHE_GEN 35
+#endif /* J9VM_OPT_VALHALLA_NESTMATES */


@pshipton and I discussed this: the generation number does not need to be updated. We don't need to have a separate non-nestmate generation. The Java version (e.g. 8 or 11) is included in the name of the file used in addition to the generation so there won't be confusion between Java versions.

Not incrementing the generation will cause a problem for any existing Java 11 shared caches, but since we don't have any regular builds of Java 11 yet, it seems the better choice to just go ahead without changing the cache generation.

keithc-ca · 2018-07-09T17:45:50Z

runtime/shared_common/OSCacheFile.cpp

@@ -563,12 +527,10 @@ SH_OSCacheFile::getMmapHeaderFieldOffsetForGen(UDATA headerGen, UDATA fieldID)
 			}
 		}
 		}
+	} else {
+		Trc_SHR_Assert_ShouldNeverHappen();


This isn't executed for as many situations as previously: Was that intentional?

Turn on nestmates flag and remove the optValhallaNestmates build definition. Signed-off-by: tajila <[email protected]>

tajila · 2018-07-09T21:15:46Z

@keithc-ca I've updated the PR

keithc-ca · 2018-07-10T15:05:13Z

Jenkins test extended plinux

keithc-ca · 2018-07-10T15:09:30Z

@tajila We should plan to put a mechanism in place so jvmti.h is generated with the appropriate content for the version of Java being built, perhaps along the lines of how forwarders.m4 works.

tajila · 2018-07-10T15:31:02Z

@keithc-ca I have opened an issue to track this #2368.

- Change aix,ppcle,390 - Remove ubuntu version - Update to hierarchical labels based on standardized schema defined in adoptium/infrastructure#93 - Also remove nestmates spec which was added by default (eclipse-openj9#2270) Issue eclipse-openj9#1562 [skip ci] Signed-off-by: Adam Brousseau <[email protected]>

tajila mentioned this pull request Jun 26, 2018

Need JVM support for nestmates #2269

Closed

tajila force-pushed the nestmates1 branch from 3b48611 to ca9c9ea Compare June 26, 2018 16:43

tajila force-pushed the nestmates1 branch from ca9c9ea to 7627c65 Compare June 26, 2018 17:05

pshipton added the comp:vm label Jun 27, 2018

tajila force-pushed the nestmates1 branch 6 times, most recently from 191b662 to 3406120 Compare June 29, 2018 18:40

pshipton reviewed Jun 29, 2018

View reviewed changes

keithc-ca reviewed Jun 29, 2018

View reviewed changes

tajila force-pushed the nestmates1 branch 2 times, most recently from ab57cdb to eabcc87 Compare June 29, 2018 21:00

AdamBrousseau mentioned this pull request Jul 6, 2018

Add spec file for Valhalla Nestmates build #2086

Closed

keithc-ca reviewed Jul 6, 2018

View reviewed changes

tajila force-pushed the nestmates1 branch from eabcc87 to a545a1e Compare July 6, 2018 21:08

keithc-ca requested changes Jul 9, 2018

View reviewed changes

tajila force-pushed the nestmates1 branch 3 times, most recently from c1f4f6a to 4bd9e0a Compare July 9, 2018 21:11

Turn on nestmates spec

1bbbb5f

Turn on nestmates flag and remove the optValhallaNestmates build definition. Signed-off-by: tajila <[email protected]>

tajila force-pushed the nestmates1 branch from 4bd9e0a to 1bbbb5f Compare July 9, 2018 21:12

keithc-ca approved these changes Jul 10, 2018

View reviewed changes

keithc-ca merged commit 7336f3a into eclipse-openj9:master Jul 10, 2018

AdamBrousseau mentioned this pull request Jul 17, 2018

Update machine labels to standard schema #2204

Merged

ChengJin01 mentioned this pull request Jul 24, 2018

Support for compiling Windows on VS2017 #1697

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Turn on nestmates spec #2270

Turn on nestmates spec #2270

tajila commented Jun 26, 2018

keithc-ca commented Jun 26, 2018

tajila commented Jun 26, 2018 •

edited

Loading

pshipton commented Jun 27, 2018

pshipton commented Jun 27, 2018

pshipton commented Jun 27, 2018

keithc-ca commented Jun 27, 2018

pshipton commented Jun 27, 2018

keithc-ca commented Jun 27, 2018 •

edited

Loading

tajila commented Jun 29, 2018

pshipton Jun 29, 2018

pshipton Jun 29, 2018

pshipton commented Jun 29, 2018

keithc-ca Jun 29, 2018

AdamBrousseau commented Jul 6, 2018

keithc-ca Jul 6, 2018

keithc-ca Jul 9, 2018

pshipton Jul 9, 2018

keithc-ca Jul 9, 2018

tajila commented Jul 9, 2018

keithc-ca commented Jul 10, 2018

keithc-ca commented Jul 10, 2018

tajila commented Jul 10, 2018

		@@ -0,0 +1,25 @@
		<!--
		Copyright (c) 2018, 2018 IBM Corp. and others

		#define OSCACHE_CURRENT_CACHE_GEN 35
		#endif /* J9VM_OPT_VALHALLA_NESTMATES */

Turn on nestmates spec #2270

Turn on nestmates spec #2270

Conversation

tajila commented Jun 26, 2018

keithc-ca commented Jun 26, 2018

tajila commented Jun 26, 2018 • edited Loading

pshipton commented Jun 27, 2018

pshipton commented Jun 27, 2018

pshipton commented Jun 27, 2018

keithc-ca commented Jun 27, 2018

pshipton commented Jun 27, 2018

keithc-ca commented Jun 27, 2018 • edited Loading

tajila commented Jun 29, 2018

pshipton Jun 29, 2018

Choose a reason for hiding this comment

pshipton Jun 29, 2018

Choose a reason for hiding this comment

pshipton commented Jun 29, 2018

keithc-ca Jun 29, 2018

Choose a reason for hiding this comment

AdamBrousseau commented Jul 6, 2018

keithc-ca Jul 6, 2018

Choose a reason for hiding this comment

keithc-ca Jul 9, 2018

Choose a reason for hiding this comment

pshipton Jul 9, 2018

Choose a reason for hiding this comment

keithc-ca Jul 9, 2018

Choose a reason for hiding this comment

tajila commented Jul 9, 2018

keithc-ca commented Jul 10, 2018

keithc-ca commented Jul 10, 2018

tajila commented Jul 10, 2018

tajila commented Jun 26, 2018 •

edited

Loading

keithc-ca commented Jun 27, 2018 •

edited

Loading