archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8282664: Unroll by hand StringUTF16 and StringLatin1 polynomial hash loops

Browse source 
Co-authored-by: Sandhya Viswanathan <sviswanathan@openjdk.org>
Co-authored-by: Ludovic Henry <luhenry@openjdk.org>
Co-authored-by: Claes Redestad <redestad@openjdk.org>
Reviewed-by: vlivanov, sviswanathan, luhenry
This commit is contained in:
Claes Redestad 2023-01-17 21:06:22 +00:00
parent ade08e190c
commit e37078f5bb
33 changed files with 1053 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/java.base/share/classes/java/lang/StringLatin1.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, 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
@ -189,11 +189,11 @@ final class StringLatin1 {
}
public static int hashCode(byte[] value) {
int h = 0;
for (byte v : value) {
h = 31 * h + (v & 0xff);
}
return h;
return switch (value.length) {
case 0 -> 0;
case 1 -> value[0] & 0xff;
default -> ArraysSupport.vectorizedHashCode(value, 0, value.length, 0, ArraysSupport.T_BOOLEAN);
};
}
public static int indexOf(byte[] value, int ch, int fromIndex) {

13
src/java.base/share/classes/java/lang/StringUTF16.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, 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
@ -412,12 +412,11 @@ final class StringUTF16 {
}
public static int hashCode(byte[] value) {
int h = 0;
int length = value.length >> 1;
for (int i = 0; i < length; i++) {
h = 31 * h + getChar(value, i);
}
return h;
return switch (value.length) {
case 0 -> 0;
case 2 -> getChar(value, 0);
default -> ArraysSupport.vectorizedHashCode(value, 0, value.length >> 1, 0, ArraysSupport.T_CHAR);
};
}
public static int indexOf(byte[] value, int ch, int fromIndex) {

6
src/java.base/share/classes/java/lang/System.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2023, 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
@ -2464,7 +2464,9 @@ public final class System {
public String newStringNoRepl(byte[] bytes, Charset cs) throws CharacterCodingException {
return String.newStringNoRepl(bytes, cs);
}
public char getUTF16Char(byte[] bytes, int index) {
return StringUTF16.getChar(bytes, index);
}
public byte[] getBytesNoRepl(String s, Charset cs) throws CharacterCodingException {
return String.getBytesNoRepl(s, cs);
}

62
src/java.base/share/classes/java/util/Arrays.java
View file

@ -25,6 +25,7 @@
package java.util;
import jdk.internal.misc.Unsafe;
import jdk.internal.util.ArraysSupport;
import jdk.internal.vm.annotation.IntrinsicCandidate;
@ -4266,15 +4267,14 @@ public class Arrays {
* @since 1.5
*/
public static int hashCode(long[] a) {
if (a == null)
if (a == null) {
return 0;
}
int result = 1;
for (long element : a) {
int elementHash = (int)(element ^ (element >>> 32));
result = 31 * result + elementHash;
}
return result;
}
@ -4295,14 +4295,14 @@ public class Arrays {
* @since 1.5
*/
public static int hashCode(int[] a) {
if (a == null)
if (a == null) {
return 0;
int result = 1;
for (int element : a)
result = 31 * result + element;
return result;
}
return switch (a.length) {
case 0 -> 1;
case 1 -> 31 + a[0];
default -> ArraysSupport.vectorizedHashCode(a, 0, a.length, 1, ArraysSupport.T_INT);
};
}
/**
@ -4322,14 +4322,14 @@ public class Arrays {
* @since 1.5
*/
public static int hashCode(short[] a) {
if (a == null)
if (a == null) {
return 0;
int result = 1;
for (short element : a)
result = 31 * result + element;
return result;
}
return switch (a.length) {
case 0 -> 1;
case 1 -> 31 + (int)a[0];
default -> ArraysSupport.vectorizedHashCode(a, 0, a.length, 1, ArraysSupport.T_SHORT);
};
}
/**
@ -4349,14 +4349,14 @@ public class Arrays {
* @since 1.5
*/
public static int hashCode(char[] a) {
if (a == null)
if (a == null) {
return 0;
int result = 1;
for (char element : a)
result = 31 * result + element;
return result;
}
return switch (a.length) {
case 0 -> 1;
case 1 -> 31 + (int)a[0];
default -> ArraysSupport.vectorizedHashCode(a, 0, a.length, 1, ArraysSupport.T_CHAR);
};
}
/**
@ -4376,14 +4376,14 @@ public class Arrays {
* @since 1.5
*/
public static int hashCode(byte[] a) {
if (a == null)
if (a == null) {
return 0;
int result = 1;
for (byte element : a)
result = 31 * result + element;
return result;
}
return switch (a.length) {
case 0 -> 1;
case 1 -> 31 + (int)a[0];
default -> ArraysSupport.vectorizedHashCode(a, 0, a.length, 1, ArraysSupport.T_BYTE);
};
}
/**