diff --git a/benchmarks/.gitattributes b/benchmarks/.gitattributes new file mode 100644 index 00000000..097f9f98 --- /dev/null +++ b/benchmarks/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/benchmarks/.gitignore b/benchmarks/.gitignore new file mode 100644 index 00000000..5226e13b --- /dev/null +++ b/benchmarks/.gitignore @@ -0,0 +1,8 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build +lib/build +.idea +.attach_pid* diff --git a/benchmarks/README.md b/benchmarks/README.md new file mode 100644 index 00000000..224ba6dc --- /dev/null +++ b/benchmarks/README.md @@ -0,0 +1,24 @@ +# ACCP Benchmarks + +## Running the benchmarks + +The benchmarks can use locally built ACCP or published ACCP. +The `lib:jmh` Gradle task runs the benchmarks and generates reports in JSON and HTML. +The reports are saved under `lib/build/results/jmh`. + +### Benchmarking published ACCP to Maven + +```bash +./gradlew lib:jmh +``` + +* `-Pfips` flag can be used to use the FIPS artifacts for benchmarking. +* `-PaccpVerion="ACCP_VERSION"` can be used to run benchmarks for a specific version of ACCP + +### Benchmarking locally built ACCP + +Use `-PaccpLocalJar="PATH_TO_LOCAL_JAR"`: + +```bash + ./gradlew -PaccpLocalJar="../../build/cmake/AmazonCorrettoCryptoProvider.jar" lib:jmh +``` diff --git a/benchmarks/gradle/wrapper/gradle-wrapper.jar b/benchmarks/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..7f93135c Binary files /dev/null and b/benchmarks/gradle/wrapper/gradle-wrapper.jar differ diff --git a/benchmarks/gradle/wrapper/gradle-wrapper.properties b/benchmarks/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..ac72c34e --- /dev/null +++ b/benchmarks/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/benchmarks/gradlew b/benchmarks/gradlew new file mode 100755 index 00000000..0adc8e1a --- /dev/null +++ b/benchmarks/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/benchmarks/gradlew.bat b/benchmarks/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/benchmarks/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/benchmarks/lib/build.gradle.kts b/benchmarks/lib/build.gradle.kts new file mode 100644 index 00000000..d54098b9 --- /dev/null +++ b/benchmarks/lib/build.gradle.kts @@ -0,0 +1,71 @@ +val accpVersion: String? by project +val accpLocalJar: String by project +val fips: Boolean by project + +plugins { + `java-library` + id("me.champeau.jmh") version "0.7.1" + id("io.morethan.jmhreport") version "0.9.0" + id("com.google.osdetector") version "1.7.0" +} + +repositories { + mavenCentral() +} + +dependencies { + jmh("org.projectlombok:lombok:1.18.28") + jmh("org.bouncycastle:bcprov-jdk15on:1.70") + + val accpArtifactId = + if (project.hasProperty("fips")) + "AmazonCorrettoCryptoProvider-FIPS" + else + "AmazonCorrettoCryptoProvider" + + val publishedAccpVersion = + if (project.hasProperty("accpVersion")) + accpVersion + else + "2.+" + + + if (project.hasProperty("accpLocalJar")) { + jmh(files(accpLocalJar)) + } else { + jmh("software.amazon.cryptools:${accpArtifactId}:$publishedAccpVersion:${osdetector.classifier}") + } + +} + +// Apply a specific Java toolchain to ease working on different environments. +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(11)) + } +} + +jmh { + // includes.add("AesXts") // can be used to run a subset of benchmarks + fork.set(1) + benchmarkMode.add("thrpt") + threads.set(1) + timeUnit.set("s") + iterations.set(5) + timeOnIteration.set("3s") + warmup.set("1s") + warmupIterations.set(3) + resultFormat.set("JSON") + duplicateClassesStrategy.set(DuplicatesStrategy.WARN) + jvmArgs.add("-DversionStr=${accpVersion}") + jvmArgs.add("-Dcom.amazon.corretto.crypto.provider.registerSecureRandom=true") +} + +jmhReport { + jmhReportOutput = "lib/build/results/jmh" + jmhResultPath = "${jmhReportOutput}/results.json" +} + +tasks.jmh { + finalizedBy(tasks.jmhReport) +} \ No newline at end of file diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmBase.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmBase.java similarity index 96% rename from src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmBase.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmBase.java index 69d470c8..5ec8ba4e 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmBase.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmBase.java @@ -1,6 +1,6 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.Key; import javax.crypto.Cipher; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmOneShot.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmOneShot.java similarity index 89% rename from src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmOneShot.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmOneShot.java index 55595fc5..b0281da8 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmOneShot.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmOneShot.java @@ -1,8 +1,10 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import javax.crypto.Cipher; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmUpdate.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmUpdate.java similarity index 92% rename from src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmUpdate.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmUpdate.java index 769bb9c0..e51cbfad 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/AesGcmUpdate.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesGcmUpdate.java @@ -1,8 +1,10 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import javax.crypto.Cipher; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/AesKwp.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesKwp.java similarity index 96% rename from src/jmh/java/com/amazon/corretto/crypto/provider/AesKwp.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesKwp.java index a55b1dcf..aeaf5fa6 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/AesKwp.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesKwp.java @@ -1,6 +1,6 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.Key; import java.security.KeyPairGenerator; @@ -9,6 +9,8 @@ import java.security.spec.RSAKeyGenParameterSpec; import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/AesXtsBenchmark.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesXtsBenchmark.java similarity index 98% rename from src/jmh/java/com/amazon/corretto/crypto/provider/AesXtsBenchmark.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesXtsBenchmark.java index 43698c1c..96082171 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/AesXtsBenchmark.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/AesXtsBenchmark.java @@ -1,6 +1,6 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.examples; +package com.amazon.corretto.crypto.provider.benchmarks; import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import java.security.SecureRandom; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/BenchmarkUtils.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/BenchmarkUtils.java similarity index 94% rename from src/jmh/java/com/amazon/corretto/crypto/provider/BenchmarkUtils.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/BenchmarkUtils.java index 8cb12fb1..04c1896b 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/BenchmarkUtils.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/BenchmarkUtils.java @@ -1,6 +1,6 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.Provider; import java.security.SecureRandom; @@ -8,6 +8,8 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider; class BenchmarkUtils { diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/Drbg.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Drbg.java similarity index 92% rename from src/jmh/java/com/amazon/corretto/crypto/provider/Drbg.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Drbg.java index 65c6a894..15295684 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/Drbg.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Drbg.java @@ -1,8 +1,10 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.SecureRandom; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/Hashes.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Hashes.java similarity index 90% rename from src/jmh/java/com/amazon/corretto/crypto/provider/Hashes.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Hashes.java index 2abd5665..3cf988c6 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/Hashes.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Hashes.java @@ -1,8 +1,10 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.MessageDigest; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/Hmac.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Hmac.java similarity index 91% rename from src/jmh/java/com/amazon/corretto/crypto/provider/Hmac.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Hmac.java index cfa51cad..f17e16a7 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/Hmac.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/Hmac.java @@ -1,9 +1,11 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/KeyAgreementEcdh.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyAgreementEcdh.java similarity index 91% rename from src/jmh/java/com/amazon/corretto/crypto/provider/KeyAgreementEcdh.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyAgreementEcdh.java index 87b1151b..5d4ffae3 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/KeyAgreementEcdh.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyAgreementEcdh.java @@ -1,11 +1,13 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.spec.ECGenParameterSpec; import javax.crypto.KeyAgreement; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/KeyGenEc.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyGenEc.java similarity index 88% rename from src/jmh/java/com/amazon/corretto/crypto/provider/KeyGenEc.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyGenEc.java index c4a4bbc3..52f290c3 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/KeyGenEc.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyGenEc.java @@ -1,10 +1,12 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.spec.ECGenParameterSpec; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/KeyGenRsa.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyGenRsa.java similarity index 88% rename from src/jmh/java/com/amazon/corretto/crypto/provider/KeyGenRsa.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyGenRsa.java index ceeb83c9..fe2435b1 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/KeyGenRsa.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/KeyGenRsa.java @@ -1,10 +1,12 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.spec.RSAKeyGenParameterSpec; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/RsaCipherOneShot.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/RsaCipherOneShot.java similarity index 94% rename from src/jmh/java/com/amazon/corretto/crypto/provider/RsaCipherOneShot.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/RsaCipherOneShot.java index 22ce4ca4..350fc1d7 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/RsaCipherOneShot.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/RsaCipherOneShot.java @@ -1,11 +1,13 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.spec.RSAKeyGenParameterSpec; import javax.crypto.Cipher; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/SignatureBase.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureBase.java similarity index 96% rename from src/jmh/java/com/amazon/corretto/crypto/provider/SignatureBase.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureBase.java index b9f25f90..b60def02 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/SignatureBase.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureBase.java @@ -1,6 +1,6 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.KeyPair; import java.security.KeyPairGenerator; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/SignatureEc.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureEc.java similarity index 88% rename from src/jmh/java/com/amazon/corretto/crypto/provider/SignatureEc.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureEc.java index 9c4e2bb9..cf50323c 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/SignatureEc.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureEc.java @@ -1,8 +1,10 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.spec.ECGenParameterSpec; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/src/jmh/java/com/amazon/corretto/crypto/provider/SignatureRsa.java b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureRsa.java similarity index 91% rename from src/jmh/java/com/amazon/corretto/crypto/provider/SignatureRsa.java rename to benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureRsa.java index ec44bfb9..6e05f9c2 100644 --- a/src/jmh/java/com/amazon/corretto/crypto/provider/SignatureRsa.java +++ b/benchmarks/lib/src/jmh/java/com/amazon/corretto/crypto/provider/benchmarks/SignatureRsa.java @@ -1,9 +1,11 @@ // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package com.amazon.corretto.crypto.provider; +package com.amazon.corretto.crypto.provider.benchmarks; import java.security.spec.PSSParameterSpec; import java.security.spec.RSAKeyGenParameterSpec; + +import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/benchmarks/lib/src/jmh/resources/com/amazon/corretto/crypto/provider/testdata/hmac.txt b/benchmarks/lib/src/jmh/resources/com/amazon/corretto/crypto/provider/testdata/hmac.txt new file mode 120000 index 00000000..9a19a09e --- /dev/null +++ b/benchmarks/lib/src/jmh/resources/com/amazon/corretto/crypto/provider/testdata/hmac.txt @@ -0,0 +1 @@ +../../../../../../../../../../../extra-jar-files/com/amazon/corretto/crypto/provider/testdata/hmac.txt \ No newline at end of file diff --git a/benchmarks/settings.gradle.kts b/benchmarks/settings.gradle.kts new file mode 100644 index 00000000..d8faf8c2 --- /dev/null +++ b/benchmarks/settings.gradle.kts @@ -0,0 +1,7 @@ +plugins { + // Apply the foojay-resolver plugin to allow automatic download of JDKs + id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" +} + +rootProject.name = "benchmarks" +include("lib") diff --git a/build.gradle b/build.gradle index d0a79e6c..ccc88777 100644 --- a/build.gradle +++ b/build.gradle @@ -10,8 +10,6 @@ plugins { id "com.diffplug.spotless" version "6.18.0" id "com.google.osdetector" version "1.7.0" id "io.github.gradle-nexus.publish-plugin" version "1.1.0" - id "io.morethan.jmhreport" version "0.9.0" - id "me.champeau.jmh" version "0.6.7" } group = 'software.amazon.cryptools' @@ -42,35 +40,6 @@ def getDescriptionForPom(isFips) { } -jmh { - //includes = ['AesXts'] // uncomment if you need to run specific benchmarks only - fork = 1 - benchmarkMode = ['thrpt'] - threads = 1 - timeUnit = 's' - iterations = 5 - timeOnIteration = '3s' - warmup = '1s' - warmupForks = 1 - warmupIterations = 3 - resultFormat = 'JSON' - duplicateClassesStrategy = DuplicatesStrategy.WARN - jvmArgs = [ - "-Djava.library.path=${rootDir}/build/cmake:" + System.getProperty("java.library.path"), - "-DversionStr=${version}", - "-Dcom.amazon.corretto.crypto.provider.registerSecureRandom=true", - ] - - sourceSets { - jmh.java.srcDirs += files(["${rootDir}/build/cmake"]) - main.java.srcDirs += files(["${rootDir}/src/com/amazon/corretto/crypto/provider"]) - } -} - -jmhReport { - jmhResultPath = project.file('build/results/jmh/results.json') - jmhReportOutput = project.file('build/results/jmh') -} spotless { java { @@ -190,8 +159,6 @@ dependencies { // Separate so we can extract the jar for the runner specifically testRunner group: 'org.junit.platform', name: 'junit-platform-console-standalone', version: '1.8.2' - jmh 'org.bouncycastle:bcprov-debug-jdk15on:1.69' - testDep 'org.apiguardian:apiguardian-api:1.1.2' testDep 'org.junit.jupiter:junit-jupiter:5.8.2' testDep 'org.junit.vintage:junit-vintage-engine:5.8.2' @@ -386,7 +353,6 @@ task build(overwrite:true) { } } } -compileJmhJava.dependsOn build task emptyJar(type: Jar) { archiveFileName = 'empty.jar' diff --git a/src/jmh/resources/com/amazon/corretto/crypto/provider/testdata/hmac.txt b/src/jmh/resources/com/amazon/corretto/crypto/provider/testdata/hmac.txt deleted file mode 120000 index d46131ac..00000000 --- a/src/jmh/resources/com/amazon/corretto/crypto/provider/testdata/hmac.txt +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../extra-jar-files/com/amazon/corretto/crypto/provider/testdata/hmac.txt \ No newline at end of file