/hg/icedtea7: 4 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Nov 15 17:00:58 UTC 2017


changeset 8165ef17735a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=8165ef17735a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Nov 13 19:08:47 2017 +0000

	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly

	2017-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
		* AUTHORS: Add Severin.
		* NEWS: Updated.

	2017-09-15  Severin Gehwolf  <sgehwolf at redhat.com>

		PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
		* tapset/hotspot.stp.in:
		Revert HeapWordSize addition made to match
		systemtap-alloc-size-workaround.patch, which
		has since been removed.


changeset 1b5dd7a1de60 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1b5dd7a1de60
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Nov 14 13:26:37 2017 +0000

	PR3493: Run AES test to test intrinsics

	2017-11-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3493: Run AES test to test intrinsics
		* Makefile.am:
		(AES_CHECK_BUILD_DIR): Define directory for
		built test class files.
		(AES_CHECK_SRC): Define source file for test.
		(check-local): Depend on check-aes.
		(clean-tests): Depend on clean-check-aes and
		also include all test build targets (clean-ecccheck,
		clean-mimetypecheck, clean-aescheck, clean-cryptocheck).
		Drop removal of test directory which fails as it's non-empty,
		due to configure's generation of jstapset.pl
		(clean-local): Remove targets moved to clean-tests.
		(.PHONY): Add clean-aescheck and clean-check-aes.
		(aescheck-build): Build the AES test.
		(clean-aescheck): Cleanup the AES test build.
		(check-aes): Run the AES test.
		(clean-check-aes): Cleanup the AES test run.
		* NEWS: Updated.


changeset 143dc20feff0 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=143dc20feff0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Nov 14 20:23:27 2017 +0000

	PR3494: Skip AES test on AArch64 due to VM crash

	2017-11-14  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3494: Skip AES test on AArch64 due to VM crash
		* Makefile.am:
		(check-aes): Don't run test if running on aarch64.


changeset 815ac08b2ac7 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=815ac08b2ac7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Nov 15 17:00:40 2017 +0000

	Added tag icedtea-2.7.0pre15 for changeset 143dc20feff0


diffstat:

 .hgtags               |   1 +
 AUTHORS               |   1 +
 ChangeLog             |  41 +++++++++++++++++++++++++++++++++++++++++
 Makefile.am           |  50 ++++++++++++++++++++++++++++++++++++++++----------
 NEWS                  |   3 +++
 tapset/hotspot.stp.in |   2 +-
 6 files changed, 87 insertions(+), 11 deletions(-)

diffs (212 lines):

diff -r ac075b2d46d6 -r 815ac08b2ac7 .hgtags
--- a/.hgtags	Sun Nov 12 23:17:59 2017 +0000
+++ b/.hgtags	Wed Nov 15 17:00:40 2017 +0000
@@ -73,3 +73,4 @@
 0e1ff6b44292ea1f621fed9e1a0d2e749dc3888f icedtea-2.7.0pre12
 12c4c5ba02a160c2241509fce5fd0c2a32013c48 icedtea-2.7.0pre13
 e9659e584b7c9bceeb0d1f9e1c9cbedf4afb8f02 icedtea-2.7.0pre14
+143dc20feff05ce1f37c46527f045207c8925a2b icedtea-2.7.0pre15
diff -r ac075b2d46d6 -r 815ac08b2ac7 AUTHORS
--- a/AUTHORS	Sun Nov 12 23:17:59 2017 +0000
+++ b/AUTHORS	Wed Nov 15 17:00:40 2017 +0000
@@ -16,6 +16,7 @@
 Matthew Flaschen <matthew.flaschen at gatech.edu>
 Michael Franz <mvfranz at gmail.com>
 Kyle Galloway <kgallowa at redhat.com>
+Severin Gehwolf <sgehwolf at redhat.com>
 Dennis Gilmore <dgilmore at redhat.com>
 Andrew Haley <aph at redhat.com>
 C. K. Jester-Young <cky944 at gmail.com>
diff -r ac075b2d46d6 -r 815ac08b2ac7 ChangeLog
--- a/ChangeLog	Sun Nov 12 23:17:59 2017 +0000
+++ b/ChangeLog	Wed Nov 15 17:00:40 2017 +0000
@@ -1,3 +1,44 @@
+2017-11-14  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3494: Skip AES test on AArch64 due to VM crash
+	* Makefile.am:
+	(check-aes): Don't run test if running on aarch64.
+
+2017-11-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3493: Run AES test to test intrinsics
+	* Makefile.am:
+	(AES_CHECK_BUILD_DIR): Define directory for
+	built test class files.
+	(AES_CHECK_SRC): Define source file for test.
+	(check-local): Depend on check-aes.
+	(clean-tests): Depend on clean-check-aes and
+	also include all test build targets (clean-ecccheck,
+	clean-mimetypecheck, clean-aescheck, clean-cryptocheck).
+	Drop removal of test directory which fails as it's non-empty,
+	due to configure's generation of jstapset.pl
+	(clean-local): Remove targets moved to clean-tests.
+	(.PHONY): Add clean-aescheck and clean-check-aes.
+	(aescheck-build): Build the AES test.
+	(clean-aescheck): Cleanup the AES test build.
+	(check-aes): Run the AES test.
+	(clean-check-aes): Cleanup the AES test run.
+	* NEWS: Updated.
+
+2017-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
+	* AUTHORS: Add Severin.
+	* NEWS: Updated.
+
+2017-09-15  Severin Gehwolf  <sgehwolf at redhat.com>
+
+	PR3470: Hotspot object_alloc tapset uses HeapWordSize incorrectly
+	* tapset/hotspot.stp.in:
+	Revert HeapWordSize addition made to match
+	systemtap-alloc-size-workaround.patch, which
+	has since been removed.
+
 2017-11-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	Bump to icedtea-2.7.0pre15.
diff -r ac075b2d46d6 -r 815ac08b2ac7 Makefile.am
--- a/Makefile.am	Sun Nov 12 23:17:59 2017 +0000
+++ b/Makefile.am	Wed Nov 15 17:00:40 2017 +0000
@@ -71,6 +71,7 @@
 CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
 ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build
 MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build
+AES_CHECK_BUILD_DIR = $(abs_top_builddir)/aescheck.build
 STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
 STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
 FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
@@ -368,6 +369,7 @@
 ECC_CHECK_SRCS = $(top_srcdir)/test/standalone/TestEllipticCurveCryptoSupport.java \
 	$(top_srcdir)/test/standalone/TestECDSA.java
 MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
+AES_CHECK_SRC = openjdk/hotspot/test/compiler/7184394/TestAESMain.java
 
 # Patch list
 
@@ -942,16 +944,12 @@
 all-local: icedtea-stage2 $(DESKTOP_FILES)
 
 check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) check-ecc check-mimetype \
- check-java-debug check-java-src
+ check-java-debug check-java-src check-aes
 
 clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports \
  clean-check-ecc clean-check-mimetype clean-check-java-debug \
- clean-check-java-src
-	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
-	  if [ -e test ] ; then \
-	    rmdir test ; \
-	  fi \
-	fi
+ clean-check-java-src clean-check-aes clean-ecccheck clean-mimetypecheck \
+ clean-aescheck clean-cryptocheck
 
 clean-local: clean-tests \
  clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
@@ -961,8 +959,7 @@
  clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
  clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
  clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \
- clean-add-tzdata-support-debug clean-cryptocheck clean-policytool- at JAVA_VER@.desktop \
- clean-jconsole- at JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck
+ clean-add-tzdata-support-debug clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -1004,7 +1001,7 @@
 	clean-fonts clean-add-mime-types-file clean-add-mime-types-file-debug clean-add-mime-types-file-boot \
 	clean-tests clean-tapset-report clean-ecccheck clean-check-ecc \
 	check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
-	check-tapset-jstack clean-check-java-debug
+	check-tapset-jstack clean-check-java-debug clean-aescheck clean-check-aes
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -3150,6 +3147,35 @@
 clean-check-ecc:
 	rm -f stamps/check-ecc.stamp
 
+# AES Intrinstic Check
+
+stamps/aescheck-build.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) stamps/extract-hotspot.stamp
+	mkdir -p $(AES_CHECK_BUILD_DIR)
+	$(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -cp `dirname $(AES_CHECK_SRC)` \
+	  -d $(AES_CHECK_BUILD_DIR) $(AES_CHECK_SRC)
+	mkdir -p stamps
+	touch $@
+
+clean-aescheck:
+	rm -rf $(AES_CHECK_BUILD_DIR)
+	rm -f stamps/aescheck-build.stamp
+
+stamps/check-aes.stamp: stamps/aescheck-build.stamp stamps/icedtea.stamp
+	set -e ; \
+	if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
+	  if test "x$(INSTALL_ARCH_DIR)" != "xaarch64" ; then \
+	    cat $(AES_CHECK_SRC)|grep '@run'|cut -d ' ' -f 5-|while read command; do \
+	      $(BUILD_SDK_DIR)/bin/java -cp $(AES_CHECK_BUILD_DIR) \
+	        -XX:+UseAESIntrinsics $${command} ; \
+	    done ; \
+	  fi ; \
+	fi
+	mkdir -p stamps
+	touch $@
+
+clean-check-aes:
+	rm -f stamps/check-aes.stamp
+
 # Installation Targets
 # ====================
 
@@ -3424,6 +3450,8 @@
 
 add-zero-debug: stamps/add-zero-debug.stamp
 
+aescheck-build: stamps/aescheck-build.stamp
+
 bootstrap-directory-stage1: stamps/bootstrap-directory-stage1.stamp
 
 bootstrap-directory-stage2: stamps/bootstrap-directory-stage2.stamp
@@ -3434,6 +3462,8 @@
 
 cacao: stamps/cacao.stamp
 
+check-aes: stamps/check-aes.stamp
+
 check-crypto: stamps/check-crypto.stamp
 
 check-crypto-boot: stamps/check-crypto-boot.stamp
diff -r ac075b2d46d6 -r 815ac08b2ac7 NEWS
--- a/NEWS	Sun Nov 12 23:17:59 2017 +0000
+++ b/NEWS	Wed Nov 15 17:00:40 2017 +0000
@@ -16,6 +16,7 @@
 
 * New features
   - PR3180: Support building without pre-compiled headers
+  - PR3493: Run AES test to test intrinsics
 * Backports
   - S8076221, PR2809, RH1302385: Disable RC4 cipher suites
   - S8075484, PR3474, RH1490713: SocketInputStream.socketRead0 can hang even with soTimeout set
@@ -26,7 +27,9 @@
   - S8188030, PR3460, RH1484079: AWT java apps fail to start when some minimal fonts are present
 * Bug fixes
   - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466
+  - PR3470, RH1492139: Hotspot object_alloc tapset uses HeapWordSize incorrectly
   - PR3480, RH1486025: ECC and NSS JVM crash
+  - PR3494: Skip AES test on AArch64 due to VM crash
 * AArch64 port
   - S8145438, PR3443, RH1482244: Guarantee failures since 8144028: Use AArch64 bit-test instructions in C2
 
diff -r ac075b2d46d6 -r 815ac08b2ac7 tapset/hotspot.stp.in
--- a/tapset/hotspot.stp.in	Sun Nov 12 23:17:59 2017 +0000
+++ b/tapset/hotspot.stp.in	Wed Nov 15 17:00:40 2017 +0000
@@ -120,7 +120,7 @@
   name = "object_alloc";
   thread_id = $arg1;
   class = user_string_n($arg2, $arg3);
-  size = $arg4 * $HeapWordSize; // Note - systemtap-alloc-size-workaround.patch
+  size = $arg4;
   probestr = sprintf("%s(thread_id=%d,class='%s',size=0x%x)",
                      name, thread_id, class, size);
 }


More information about the distro-pkg-dev mailing list