1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8355559: Benchmark modification/extension shouldn't affect the behavior of other benchmarks

Browse Source 
Reviewed-by: ecaspole
This commit is contained in:
Sergey Kuksenko 2025-05-01 18:45:20 +00:00
parent 9e26b9facb
commit c116b18b89
2 changed files with 81 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/micro/org/openjdk/bench/javax/crypto/full/AESBench.java
View File

@ -25,9 +25,6 @@ package org.openjdk.bench.javax.crypto.full;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Param;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.infra.Blackhole;
import java.security.GeneralSecurityException;
import org.openjdk.jmh.annotations.Fork;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
@ -39,10 +36,9 @@ import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidParameterSpecException;
@Fork(jvmArgs = {"-Xms20g", "-Xmx20g", "-XX:+UseZGC"})
public class AESBench extends CryptoBase {
public static final int SET_SIZE = 8;
public static final int SET_SIZE = 128;
@Param({"AES/ECB/NoPadding", "AES/ECB/PKCS5Padding", "AES/CBC/NoPadding", "AES/CBC/PKCS5Padding"})
private String algorithm;
@ -55,9 +51,8 @@ public class AESBench extends CryptoBase {
byte[][] data;
byte[][] encryptedData;
private Cipher encryptCipher;
private Cipher decryptCipher;
private byte[] outBuffer;
Cipher encryptCipher;
Cipher decryptCipher;
int index = 0;
@Setup
@ -71,7 +66,6 @@ public class AESBench extends CryptoBase {
decryptCipher.init(Cipher.DECRYPT_MODE, ks, encryptCipher.getParameters());
data = fillRandom(new byte[SET_SIZE][dataSize]);
encryptedData = fillEncrypted(data, encryptCipher);
outBuffer = new byte[dataSize + 128]; // extra space for tag, etc
}
@Benchmark
@ -81,25 +75,10 @@ public class AESBench extends CryptoBase {
return encryptCipher.doFinal(d);
}
@Benchmark
public void encrypt2(Blackhole bh) throws GeneralSecurityException {
byte[] d = data[index];
index = (index +1) % SET_SIZE;
bh.consume(encryptCipher.doFinal(d, 0, d.length, outBuffer));
}
@Benchmark
public byte[] decrypt() throws BadPaddingException, IllegalBlockSizeException {
byte[] e = encryptedData[index];
index = (index +1) % SET_SIZE;
return decryptCipher.doFinal(e);
}
@Benchmark
public void decrypt2(Blackhole bh) throws GeneralSecurityException {
byte[] e = encryptedData[index];
index = (index +1) % SET_SIZE;
bh.consume(decryptCipher.doFinal(e, 0, e.length, outBuffer));
}
}

78
test/micro/org/openjdk/bench/javax/crypto/full/AESExtraBench.java Normal file
View File

@ -0,0 +1,78 @@
/*
* Copyright (c) 2015, 2025, 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.
*/
package org.openjdk.bench.javax.crypto.full;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Param;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.infra.Blackhole;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec;
import java.security.GeneralSecurityException;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidParameterSpecException;
public class AESExtraBench extends AESBench {
public static final int SET_SIZE = 8;
@Param({"AES/CBC/NoPadding"})
private String algorithm;
@Param({"128", "192", "256"})
private int keyLength;
@Param({"" + 16 * 1024})
private int dataSize;
private byte[] outBuffer;
int index = 0;
@Setup
public void setup() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException, InvalidAlgorithmParameterException, InvalidParameterSpecException {
super.setup();
outBuffer = new byte[dataSize + 128]; // extra space for tag, etc
}
@Benchmark
public int encrypt2() throws GeneralSecurityException {
byte[] d = data[index];
index = (index +1) % SET_SIZE;
return encryptCipher.doFinal(d, 0, d.length, outBuffer);
}
@Benchmark
public int decrypt2() throws GeneralSecurityException {
byte[] e = encryptedData[index];
index = (index +1) % SET_SIZE;
return decryptCipher.doFinal(e, 0, e.length, outBuffer);
}
}