From 0dc88413d6dab7fe47aa481489e3e51c6124af4f Mon Sep 17 00:00:00 2001 From: Jack Tjaden Date: Fri, 10 Jan 2025 11:44:38 -0700 Subject: [PATCH] Changed table unit to % --- examples/provider/CryptoBenchmark.java | 91 +++++++++++++------------- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/examples/provider/CryptoBenchmark.java b/examples/provider/CryptoBenchmark.java index 4e3fe02..1253450 100644 --- a/examples/provider/CryptoBenchmark.java +++ b/examples/provider/CryptoBenchmark.java @@ -70,51 +70,52 @@ private static void printProviderInfo(Provider provider) { } private static void printDeltaTable() { - /* Variables for table generation */ - Map> groupedResults; - String operation; - Map providerResults; - double wolfSpeed; - String provider; - double otherSpeed; - double deltaMiBs; - double deltaPercent; - - System.out.println("\nPerformance Delta (compared to wolfJCE)"); - System.out.println("-----------------------------------------------------------------------------"); - System.out.println("| Operation | Size MiB | ms | MiB/s |"); - System.out.println("|------------------------------------------|----------|----------|----------|"); - - /* Group results by operation */ - groupedResults = new HashMap<>(); - for (BenchmarkResult result : results) { - groupedResults - .computeIfAbsent(result.operation, k -> new HashMap<>()) - .put(result.provider, result.throughput); + /* Variables for table generation */ + Map> groupedResults; + String operation; + Map providerResults; + double wolfSpeed; + String provider; + double otherSpeed; + double deltaMiBs; + double deltaPercent; + + System.out.println("\nPerformance Delta (compared to wolfJCE)"); + System.out.println("-----------------------------------------------------------------------------"); + System.out.println("| Operation | Provider | Delta | Delta |"); + System.out.println("| | | (MiB/s) | (%) |"); + System.out.println("|------------------------------------------|----------|----------|----------|"); + + /* Group results by operation */ + groupedResults = new HashMap<>(); + for (BenchmarkResult result : results) { + groupedResults + .computeIfAbsent(result.operation, k -> new HashMap<>()) + .put(result.provider, result.throughput); + } + + /* Calculate and print deltas */ + for (Map.Entry> entry : groupedResults.entrySet()) { + operation = entry.getKey(); + providerResults = entry.getValue(); + wolfSpeed = providerResults.getOrDefault("wolfJCE", 0.0); + + for (Map.Entry providerEntry : providerResults.entrySet()) { + provider = providerEntry.getKey(); + if (!provider.equals("wolfJCE")) { + otherSpeed = providerEntry.getValue(); + deltaMiBs = wolfSpeed - otherSpeed; + deltaPercent = ((wolfSpeed / otherSpeed) - 1.0) * 100; + + System.out.printf("| %-40s | %-8s | %+8.2f | %+8.1f |%n", + operation, + provider, + deltaMiBs, + deltaPercent); + } } - - /* Calculate and print deltas */ - for (Map.Entry> entry : groupedResults.entrySet()) { - operation = entry.getKey(); - providerResults = entry.getValue(); - wolfSpeed = providerResults.getOrDefault("wolfJCE", 0.0); - - for (Map.Entry providerEntry : providerResults.entrySet()) { - provider = providerEntry.getKey(); - if (!provider.equals("wolfJCE")) { - otherSpeed = providerEntry.getValue(); - deltaMiBs = wolfSpeed - otherSpeed; - deltaPercent = ((wolfSpeed / otherSpeed) - 1.0) * 100; - - System.out.printf("| %-40s | %-8s | %+8.2f | %+8.1f |%n", - operation, - provider, - deltaMiBs, - deltaPercent); - } - } - } - System.out.println("-----------------------------------------------------------------------------"); + } + System.out.println("-----------------------------------------------------------------------------"); } private static void runBenchmark(String algorithm, String mode, String padding, @@ -253,8 +254,6 @@ public static void main(String[] args) { providerNameList.add("BC"); } - System.out.println("DES3 Enabled: " + FeatureDetect.Des3Enabled()); - Provider[] providers = providerList.toArray(new Provider[0]); String[] providerNames = providerNameList.toArray(new String[0]);