/hg/release/icedtea7-forest-2.1/hotspot: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 17 00:52:44 PDT 2012
changeset d28c14c79ddf in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=d28c14c79ddf
author: andrew
date: Wed Oct 17 08:21:35 2012 +0100
Removed tag icedtea-2.1.3
changeset 96ba7edfedfa in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=96ba7edfedfa
author: coleenp
date: Wed Oct 17 08:52:25 2012 +0100
7158800: Improve storage of symbol tables
Summary: Use an alternate version of hashing algorithm for symbol string tables and after a certain bucket size to improve performance
Reviewed-by: pbk, kamg, dlong, kvn, fparain
changeset a456d0771ba0 in /hg/release/icedtea7-forest-2.1/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot?cmd=changeset;node=a456d0771ba0
author: andrew
date: Wed Oct 17 08:52:30 2012 +0100
Added tag icedtea-2.1.3 for changeset 96ba7edfedfa
diffstat:
.hgtags | 4 +
src/share/vm/classfile/altHashing.cpp | 304 +
src/share/vm/classfile/altHashing.hpp | 62 +
src/share/vm/classfile/javaClasses.cpp | 22 +-
src/share/vm/classfile/javaClasses.hpp | 24 +-
src/share/vm/classfile/symbolTable.cpp | 153 +-
src/share/vm/classfile/symbolTable.hpp | 38 +-
src/share/vm/memory/dump.cpp | 6 +-
src/share/vm/prims/jni.cpp | 1 +
src/share/vm/runtime/globals.hpp | 3 +
src/share/vm/runtime/init.cpp | 5 +
src/share/vm/runtime/safepoint.cpp | 17 +-
src/share/vm/utilities/hashtable.cpp | 51 +-
src/share/vm/utilities/hashtable.hpp | 39 +-
src/share/vm/utilities/hashtable.inline.hpp | 23 +-
test/runtime/7158800/BadUtf8.java | 1254 +
test/runtime/7158800/InternTest.java | 80 +
test/runtime/7158800/Test7158800.sh | 91 +
test/runtime/7158800/badstrings.txt | 30001 ++++++++++++++++++++++++++
19 files changed, 32123 insertions(+), 55 deletions(-)
diffs (truncated from 32596 to 500 lines):
diff -r 767fdaea4155 -r a456d0771ba0 .hgtags
--- a/.hgtags Tue Oct 16 21:33:00 2012 +0100
+++ b/.hgtags Wed Oct 17 08:52:30 2012 +0100
@@ -221,3 +221,7 @@
8b7c4c5f6ba9a0a7e8114d886a574d99827934a1 icedtea-2.1.1
fbe959dad801cae4c21edcd4afdc0e030f1d07b4 icedtea-2.1.2
5da7e3791b0d3b2930dffa33e51c73fb93697a41 icedtea-2.1.3
+5da7e3791b0d3b2930dffa33e51c73fb93697a41 icedtea-2.1.3
+0000000000000000000000000000000000000000 icedtea-2.1.3
+0000000000000000000000000000000000000000 icedtea-2.1.3
+96ba7edfedfab0ed332b24cdb161e73e3add5482 icedtea-2.1.3
diff -r 767fdaea4155 -r a456d0771ba0 src/share/vm/classfile/altHashing.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/classfile/altHashing.cpp Wed Oct 17 08:52:30 2012 +0100
@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "classfile/altHashing.hpp"
+#include "classfile/symbolTable.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "oops/markOop.hpp"
+#include "runtime/thread.hpp"
+
+// Get the hash code of the classes mirror if it exists, otherwise just
+// return a random number, which is one of the possible hash code used for
+// objects. We don't want to call the synchronizer hash code to install
+// this value because it may safepoint.
+intptr_t object_hash(klassOop k) {
+ intptr_t hc = k->java_mirror()->mark()->hash();
+ return hc != markOopDesc::no_hash ? hc : os::random();
+}
+
+// Seed value used for each alternative hash calculated.
+jint AltHashing::compute_seed() {
+ jlong nanos = os::javaTimeNanos();
+ jlong now = os::javaTimeMillis();
+ jint SEED_MATERIAL[8] = {
+ (jint) object_hash(SystemDictionary::String_klass()),
+ (jint) object_hash(SystemDictionary::System_klass()),
+ (jint) os::random(), // current thread isn't a java thread
+ (jint) (((julong)nanos) >> 32),
+ (jint) nanos,
+ (jint) (((julong)now) >> 32),
+ (jint) now,
+ (jint) (os::javaTimeNanos() >> 2)
+ };
+
+ return murmur3_32(SEED_MATERIAL, 8);
+}
+
+
+// Murmur3 hashing for Symbol
+jint AltHashing::murmur3_32(jint seed, const jbyte* data, int len) {
+ jint h1 = seed;
+ int count = len;
+ int offset = 0;
+
+ // body
+ while (count >= 4) {
+ jint k1 = (data[offset] & 0x0FF)
+ | (data[offset + 1] & 0x0FF) << 8
+ | (data[offset + 2] & 0x0FF) << 16
+ | data[offset + 3] << 24;
+
+ count -= 4;
+ offset += 4;
+
+ k1 *= 0xcc9e2d51;
+ k1 = Integer_rotateLeft(k1, 15);
+ k1 *= 0x1b873593;
+
+ h1 ^= k1;
+ h1 = Integer_rotateLeft(h1, 13);
+ h1 = h1 * 5 + 0xe6546b64;
+ }
+
+ // tail
+
+ if (count > 0) {
+ jint k1 = 0;
+
+ switch (count) {
+ case 3:
+ k1 ^= (data[offset + 2] & 0xff) << 16;
+ // fall through
+ case 2:
+ k1 ^= (data[offset + 1] & 0xff) << 8;
+ // fall through
+ case 1:
+ k1 ^= (data[offset] & 0xff);
+ // fall through
+ default:
+ k1 *= 0xcc9e2d51;
+ k1 = Integer_rotateLeft(k1, 15);
+ k1 *= 0x1b873593;
+ h1 ^= k1;
+ }
+ }
+
+ // finalization
+ h1 ^= len;
+
+ // finalization mix force all bits of a hash block to avalanche
+ h1 ^= ((unsigned int)h1) >> 16;
+ h1 *= 0x85ebca6b;
+ h1 ^= ((unsigned int)h1) >> 13;
+ h1 *= 0xc2b2ae35;
+ h1 ^= ((unsigned int)h1) >> 16;
+
+ return h1;
+}
+
+// Murmur3 hashing for Strings
+jint AltHashing::murmur3_32(jint seed, const jchar* data, int len) {
+ jint h1 = seed;
+
+ int off = 0;
+ int count = len;
+
+ // body
+ while (count >= 2) {
+ jchar d1 = data[off++] & 0xFFFF;
+ jchar d2 = data[off++];
+ jint k1 = (d1 | d2 << 16);
+
+ count -= 2;
+
+ k1 *= 0xcc9e2d51;
+ k1 = Integer_rotateLeft(k1, 15);
+ k1 *= 0x1b873593;
+
+ h1 ^= k1;
+ h1 = Integer_rotateLeft(h1, 13);
+ h1 = h1 * 5 + 0xe6546b64;
+ }
+
+ // tail
+
+ if (count > 0) {
+ int k1 = data[off];
+
+ k1 *= 0xcc9e2d51;
+ k1 = Integer_rotateLeft(k1, 15);
+ k1 *= 0x1b873593;
+ h1 ^= k1;
+ }
+
+ // finalization
+ h1 ^= len * 2; // (Character.SIZE / Byte.SIZE);
+
+ // finalization mix force all bits of a hash block to avalanche
+ h1 ^= ((unsigned int)h1) >> 16;
+ h1 *= 0x85ebca6b;
+ h1 ^= ((unsigned int)h1) >> 13;
+ h1 *= 0xc2b2ae35;
+ h1 ^= ((unsigned int)h1) >> 16;
+
+ return h1;
+}
+
+// Hash used for the seed.
+jint AltHashing::murmur3_32(jint seed, const int* data, int len) {
+ jint h1 = seed;
+
+ int off = 0;
+ int end = len;
+
+ // body
+ while (off < end) {
+ jint k1 = data[off++];
+
+ k1 *= 0xcc9e2d51;
+ k1 = Integer_rotateLeft(k1, 15);
+ k1 *= 0x1b873593;
+
+ h1 ^= k1;
+ h1 = Integer_rotateLeft(h1, 13);
+ h1 = h1 * 5 + 0xe6546b64;
+ }
+
+ // tail (always empty, as body is always 32-bit chunks)
+
+ // finalization
+
+ h1 ^= len * 4; // (Integer.SIZE / Byte.SIZE);
+
+ // finalization mix force all bits of a hash block to avalanche
+ h1 ^= ((juint)h1) >> 16;
+ h1 *= 0x85ebca6b;
+ h1 ^= ((juint)h1) >> 13;
+ h1 *= 0xc2b2ae35;
+ h1 ^= ((juint)h1) >> 16;
+
+ return h1;
+}
+
+jint AltHashing::murmur3_32(const int* data, int len) {
+ return murmur3_32(0, data, len);
+}
+
+#ifndef PRODUCT
+// Overloaded versions for internal test.
+jint AltHashing::murmur3_32(const jbyte* data, int len) {
+ return murmur3_32(0, data, len);
+}
+
+jint AltHashing::murmur3_32(const jchar* data, int len) {
+ return murmur3_32(0, data, len);
+}
+
+// Internal test for alternate hashing. Translated from JDK version
+// test/sun/misc/Hashing.java
+static const jbyte ONE_BYTE[] = { (jbyte) 0x80};
+static const jbyte TWO_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81};
+static const jchar ONE_CHAR[] = { (jchar) 0x8180};
+static const jbyte THREE_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82};
+static const jbyte FOUR_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82, (jbyte) 0x83};
+static const jchar TWO_CHAR[] = { (jchar) 0x8180, (jchar) 0x8382};
+static const jint ONE_INT[] = { 0x83828180};
+static const jbyte SIX_BYTE[] = { (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82, (jbyte) 0x83, (jbyte) 0x84, (jbyte) 0x85};
+static const jchar THREE_CHAR[] = { (jchar) 0x8180, (jchar) 0x8382, (jchar) 0x8584};
+static const jbyte EIGHT_BYTE[] = {
+ (jbyte) 0x80, (jbyte) 0x81, (jbyte) 0x82,
+ (jbyte) 0x83, (jbyte) 0x84, (jbyte) 0x85,
+ (jbyte) 0x86, (jbyte) 0x87};
+static const jchar FOUR_CHAR[] = {
+ (jchar) 0x8180, (jchar) 0x8382,
+ (jchar) 0x8584, (jchar) 0x8786};
+
+static const jint TWO_INT[] = { 0x83828180, 0x87868584};
+
+static const juint MURMUR3_32_X86_CHECK_VALUE = 0xB0F57EE3;
+
+void AltHashing::testMurmur3_32_ByteArray() {
+ // printf("testMurmur3_32_ByteArray\n");
+
+ jbyte* vector = new jbyte[256];
+ jbyte* hashes = new jbyte[4 * 256];
+
+ for (int i = 0; i < 256; i++) {
+ vector[i] = (jbyte) i;
+ }
+
+ // Hash subranges {}, {0}, {0,1}, {0,1,2}, ..., {0,...,255}
+ for (int i = 0; i < 256; i++) {
+ jint hash = murmur3_32(256 - i, vector, i);
+ hashes[i * 4] = (jbyte) hash;
+ hashes[i * 4 + 1] = (jbyte) (((juint)hash) >> 8);
+ hashes[i * 4 + 2] = (jbyte) (((juint)hash) >> 16);
+ hashes[i * 4 + 3] = (jbyte) (((juint)hash) >> 24);
+ }
+
+ // hash to get const result.
+ juint final_hash = murmur3_32(hashes, 4*256);
+
+ assert (MURMUR3_32_X86_CHECK_VALUE == final_hash,
+ err_msg(
+ "Calculated hash result not as expected. Expected %08X got %08X\n",
+ MURMUR3_32_X86_CHECK_VALUE,
+ final_hash));
+}
+
+void AltHashing::testEquivalentHashes() {
+ jint jbytes, jchars, ints;
+
+ // printf("testEquivalentHashes\n");
+
+ jbytes = murmur3_32(TWO_BYTE, 2);
+ jchars = murmur3_32(ONE_CHAR, 1);
+ assert (jbytes == jchars,
+ err_msg("Hashes did not match. b:%08x != c:%08x\n", jbytes, jchars));
+
+ jbytes = murmur3_32(FOUR_BYTE, 4);
+ jchars = murmur3_32(TWO_CHAR, 2);
+ ints = murmur3_32(ONE_INT, 1);
+ assert ((jbytes == jchars) && (jbytes == ints),
+ err_msg("Hashes did not match. b:%08x != c:%08x != i:%08x\n", jbytes, jchars, ints));
+
+ jbytes = murmur3_32(SIX_BYTE, 6);
+ jchars = murmur3_32(THREE_CHAR, 3);
+ assert (jbytes == jchars,
+ err_msg("Hashes did not match. b:%08x != c:%08x\n", jbytes, jchars));
+
+ jbytes = murmur3_32(EIGHT_BYTE, 8);
+ jchars = murmur3_32(FOUR_CHAR, 4);
+ ints = murmur3_32(TWO_INT, 2);
+ assert ((jbytes == jchars) && (jbytes == ints),
+ err_msg("Hashes did not match. b:%08x != c:%08x != i:%08x\n", jbytes, jchars, ints));
+}
+
+// Returns true if the alternate hashcode is correct
+void AltHashing::test_alt_hash() {
+ testMurmur3_32_ByteArray();
+ testEquivalentHashes();
+}
+#endif // PRODUCT
diff -r 767fdaea4155 -r a456d0771ba0 src/share/vm/classfile/altHashing.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/classfile/altHashing.hpp Wed Oct 17 08:52:30 2012 +0100
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_CLASSFILE_ALTHASHING_HPP
+#define SHARE_VM_CLASSFILE_ALTHASHING_HPP
+
+#include "prims/jni.h"
+#include "classfile/symbolTable.hpp"
+
+/**
+ * Hashing utilities.
+ *
+ * Implementation of Murmur3 hashing.
+ * This code was translated from src/share/classes/sun/misc/Hashing.java
+ * code in the JDK.
+ */
+
+class AltHashing : AllStatic {
+
+ // utility function copied from java/lang/Integer
+ static jint Integer_rotateLeft(jint i, int distance) {
+ return (i << distance) | (((juint)i) >> (32-distance));
+ }
+ static jint murmur3_32(const int* data, int len);
+ static jint murmur3_32(jint seed, const int* data, int len);
+
+#ifndef PRODUCT
+ // Hashing functions used for internal testing
+ static jint murmur3_32(const jbyte* data, int len);
+ static jint murmur3_32(const jchar* data, int len);
+ static void testMurmur3_32_ByteArray();
+ static void testEquivalentHashes();
+#endif // PRODUCT
+
+ public:
+ static jint compute_seed();
+ static jint murmur3_32(jint seed, const jbyte* data, int len);
+ static jint murmur3_32(jint seed, const jchar* data, int len);
+ NOT_PRODUCT(static void test_alt_hash();)
+};
+#endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP
diff -r 767fdaea4155 -r a456d0771ba0 src/share/vm/classfile/javaClasses.cpp
--- a/src/share/vm/classfile/javaClasses.cpp Tue Oct 16 21:33:00 2012 +0100
+++ b/src/share/vm/classfile/javaClasses.cpp Wed Oct 17 08:52:30 2012 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/altHashing.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/vmSymbols.hpp"
@@ -324,13 +325,26 @@
return result;
}
-unsigned int java_lang_String::hash_string(oop java_string) {
+unsigned int java_lang_String::to_hash(oop java_string) {
+ int length = java_lang_String::length(java_string);
+ // Zero length string will hash to zero with String.toHash() function.
+ if (length == 0) return 0;
+
typeArrayOop value = java_lang_String::value(java_string);
int offset = java_lang_String::offset(java_string);
+ return java_lang_String::to_hash(value->char_at_addr(offset), length);
+}
+
+unsigned int java_lang_String::hash_string(oop java_string) {
int length = java_lang_String::length(java_string);
-
- if (length == 0) return 0;
- return hash_string(value->char_at_addr(offset), length);
+ // Zero length string doesn't hash necessarily hash to zero.
+ if (length == 0) {
+ return StringTable::hash_string(NULL, 0);
+ }
+
+ typeArrayOop value = java_lang_String::value(java_string);
+ int offset = java_lang_String::offset(java_string);
+ return StringTable::hash_string(value->char_at_addr(offset), length);
}
Symbol* java_lang_String::as_symbol(Handle java_string, TRAPS) {
diff -r 767fdaea4155 -r a456d0771ba0 src/share/vm/classfile/javaClasses.hpp
--- a/src/share/vm/classfile/javaClasses.hpp Tue Oct 16 21:33:00 2012 +0100
+++ b/src/share/vm/classfile/javaClasses.hpp Wed Oct 17 08:52:30 2012 +0100
@@ -110,20 +110,16 @@
static jchar* as_unicode_string(oop java_string, int& length);
// Compute the hash value for a java.lang.String object which would
- // contain the characters passed in. This hash value is used for at
- // least two purposes.
+ // contain the characters passed in.
//
- // (a) As the hash value used by the StringTable for bucket selection
- // and comparison (stored in the HashtableEntry structures). This
- // is used in the String.intern() method.
+ // As the hash value used by the String object itself, in
+ // String.hashCode(). This value is normally calculated in Java code
+ // in the String.hashCode method(), but is precomputed for String
+ // objects in the shared archive file.
+ // hash P(31) from Kernighan & Ritchie
//
- // (b) As the hash value used by the String object itself, in
- // String.hashCode(). This value is normally calculate in Java code
- // in the String.hashCode method(), but is precomputed for String
- // objects in the shared archive file.
- //
- // For this reason, THIS ALGORITHM MUST MATCH String.hashCode().
- static unsigned int hash_string(jchar* s, int len) {
+ // For this reason, THIS ALGORITHM MUST MATCH String.toHash().
+ template <typename T> static unsigned int to_hash(T* s, int len) {
unsigned int h = 0;
while (len-- > 0) {
h = 31*h + (unsigned int) *s;
@@ -131,6 +127,10 @@
}
return h;
}
+ static unsigned int to_hash(oop java_string);
+
+ // This is the string hash code used by the StringTable, which may be
+ // the same as String.toHash or an alternate hash code.
static unsigned int hash_string(oop java_string);
static bool equals(oop java_string, jchar* chars, int len);
diff -r 767fdaea4155 -r a456d0771ba0 src/share/vm/classfile/symbolTable.cpp
--- a/src/share/vm/classfile/symbolTable.cpp Tue Oct 16 21:33:00 2012 +0100
+++ b/src/share/vm/classfile/symbolTable.cpp Wed Oct 17 08:52:30 2012 +0100
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "classfile/altHashing.hpp"
#include "classfile/javaClasses.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
@@ -33,10 +34,13 @@
#include "oops/oop.inline2.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/hashtable.inline.hpp"
+#include "utilities/numberSeq.hpp"
// --------------------------------------------------------------------------
SymbolTable* SymbolTable::_the_table = NULL;
+bool SymbolTable::_needs_rehashing = false;
+jint SymbolTable::_seed = 0;
Symbol* SymbolTable::allocate_symbol(const u1* name, int len, TRAPS) {
// Don't allow symbols to be created which cannot fit in a Symbol*.
@@ -120,12 +124,41 @@
}
}
+unsigned int SymbolTable::new_hash(Symbol* sym) {
More information about the distro-pkg-dev
mailing list