From cc21ca0abaf3170f7315ee8931bf4e149391521c Mon Sep 17 00:00:00 2001
From: Didactic Drunk <1479616+didactic-drunk@users.noreply.github.com>
Date: Thu, 12 May 2022 13:33:45 -0700
Subject: [PATCH] Include Random::Secure in benchmarks/rand.cr

---
 benchmarks/rand.cr  | 33 ++++++++++++++++-----------------
 benchmarks/rand.txt | 15 ++++++++-------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/benchmarks/rand.cr b/benchmarks/rand.cr
index a9b6e26..dc25ab6 100644
--- a/benchmarks/rand.cr
+++ b/benchmarks/rand.cr
@@ -3,34 +3,33 @@ require "random/pcg32"
 require "random/isaac"
 require "../src/sodium/cipher/chalsa"
 
-pcgrand = Random::PCG32.new 0
-isaacrand = Random::ISAAC.new Bytes.new(32)
+randoms = {
+  "PCG"    => Random::PCG32.new(0),
+  "ISAAC"  => Random::ISAAC.new(Bytes.new(32)),
+  "Secure" => Random::Secure,
+}
 
 ciphers = {{ Sodium::Cipher::Chalsa.subclasses }}.map do |klass|
-  cipher = klass.new.tap do |c|
-    c.key = Bytes.new c.key_size
-    c.nonce = Bytes.new c.nonce_size
-  end
+  key = Bytes.new klass.key_size
+  nonce = Bytes.new klass.nonce_size
+  cipher = klass.new key, nonce
 
   # {short_name, cipher}
   {klass.to_s.split("::").last, cipher}
 end.to_a
-# p ciphers
 
 buf = Bytes.new 1024
 
 Benchmark.ips warmup: 0.5 do |bm|
-  bm.report "PCG32" do
-    pcgrand.random_bytes buf
-  end
-
-  bm.report "ISAAC" do
-    isaacrand.random_bytes buf
-  end
-
-  ciphers.each do |name, cipher|
+  randoms.each do |name, random|
     bm.report "#{name}" do
-      cipher.random_bytes buf
+      random.random_bytes buf
+    end
+  end
+
+  ciphers.each do |name, random|
+    bm.report "#{name}" do
+      random.random_bytes buf
     end
   end
 end
diff --git a/benchmarks/rand.txt b/benchmarks/rand.txt
index 9b2eaa2..2c2a906 100644
--- a/benchmarks/rand.txt
+++ b/benchmarks/rand.txt
@@ -1,7 +1,8 @@
-       PCG32 606.78k (  1.65µs) (± 1.07%)  0.0B/op   4.19× slower
-       ISAAC 373.63k (  2.68µs) (± 1.95%)  0.0B/op   6.80× slower
-    XSalsa20   1.84M (544.61ns) (± 1.17%)  0.0B/op   1.38× slower
-     Salsa20   2.37M (421.53ns) (± 1.24%)  0.0B/op   1.07× slower
-   XChaCha20   1.88M (530.86ns) (± 1.46%)  0.0B/op   1.35× slower
-ChaCha20Ietf   2.54M (393.65ns) (± 1.22%)  0.0B/op        fastest
-    ChaCha20   2.51M (398.58ns) (± 1.73%)  0.0B/op   1.01× slower
+         PCG   1.29M (776.49ns) (± 1.13%)  0.0B/op   1.07× slower
+       ISAAC 530.69k (  1.88µs) (± 0.98%)  0.0B/op   2.60× slower
+      Secure 318.19k (  3.14µs) (± 2.30%)  0.0B/op   4.33× slower
+    XSalsa20   1.04M (960.42ns) (± 1.34%)  0.0B/op   1.32× slower
+     Salsa20   1.16M (862.14ns) (± 1.29%)  0.0B/op   1.19× slower
+   XChaCha20   1.22M (818.52ns) (± 1.86%)  0.0B/op   1.13× slower
+ChaCha20Ietf   1.38M (726.43ns) (± 1.28%)  0.0B/op   1.00× slower
+    ChaCha20   1.38M (725.47ns) (± 1.33%)  0.0B/op        fastest