X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fsec%2Fbenchmarks.c;h=d0e3cdfffaf8aaacc21d34c47c7508a41c10af10;hb=751e0228258e4c9e738fdcbfd43e45cdf873a553;hp=afe727517b39280acbdcc16ff38e3f6cca1bfd51;hpb=d49cf5d4b33cdefaa113ec88d83ac832de179554;p=bertos.git

diff --git a/bertos/sec/benchmarks.c b/bertos/sec/benchmarks.c
index afe72751..d0e3cdff 100644
--- a/bertos/sec/benchmarks.c
+++ b/bertos/sec/benchmarks.c
@@ -1,5 +1,4 @@
 #include "benchmarks.h"
-#include <sec/hash.h>
 #include <drv/timer.h>
 #include <string.h>
 
@@ -31,17 +30,51 @@ void prng_benchmark(PRNG *prng, const char *hname, int numbytes)
 	prng_reseed(prng, buf);
 
 	ticks_t t = timer_clock();
+	enum { CYCLES = 2048 };
 
-	for (int j=0;j<2048;++j) {
+	for (int j=0;j<CYCLES;++j)
+	{
 		for (int i=0; i<(numbytes+511)/512-1; ++i)
 			prng_generate(prng, buf, 512);
-		prng_generate(prng, buf, numbytes%512);
+		if (numbytes % 512)
+			prng_generate(prng, buf, numbytes%512);
 	}
 
 	t = timer_clock() - t;
 
-	utime_t usec = ticks_to_us(t) / 2048;
+	utime_t usec = ticks_to_us(t) / CYCLES;
 	kprintf("%s @ %ldMhz: %s generation of %d random bytes: %lu.%lu ms\n", CPU_CORE_NAME, CPU_FREQ/1000000, hname, numbytes, (usec/1000), (usec % 1000));
 	kprintf("Sample of random data:\n");
 	kdump(buf, MIN(numbytes, 64));
 }
+
+void cipher_benchmark(BlockCipher *c, const char *cname, int numbytes)
+{
+	memset(buf, 0x12, sizeof(buf));
+
+	ASSERT(sizeof(buf) >= cipher_key_len(c));
+	cipher_set_key(c, buf);
+
+	uint8_t iv[cipher_block_len(c)];
+	memset(iv, 0, sizeof(iv));
+
+	ticks_t t = timer_clock();
+	enum { CYCLES = 64 };
+
+	for (int j=0;j<CYCLES;++j)
+	{
+		cipher_cbc_begin(c, iv);
+		int numblocks = (numbytes / cipher_block_len(c)) + 1;
+		for (int i=0; i<numblocks; ++i)
+			cipher_cbc_encrypt(c, buf);
+	}
+
+	t = timer_clock() - t;
+
+	utime_t usec = ticks_to_us(t) / CYCLES;
+	kprintf("%s @ %ldMhz: %s-CBC of %d bytes: %lu.%lu ms (%d KiB/s)\n",
+			CPU_CORE_NAME, CPU_FREQ/1000000,
+			cname, numbytes,
+			(usec/1000), (usec % 1000),
+			(uint32_t)(numbytes * (CYCLES * 1000000 / 1024) / ticks_to_us(t)));
+}