diff options
author | lloyd <[email protected]> | 2012-02-20 21:10:26 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2012-02-20 21:10:26 +0000 |
commit | e5a1b8c4392b5383af133591cb9238fb8c1b4516 (patch) | |
tree | a3f2fdd46fa71ff88227881f81675038c70e79e0 | |
parent | 018bfa3c50ec857ce93b44096fc1890dc7dd65a5 (diff) |
The benchmark examples ran very slowly because they were passing
16*1024 to an argument that treated those values as KiB, it took the
RNG ~3 seconds to create 16 MiB of data to randomize the input. Change
to 16. Also cap the value that can be passed to --buf-size to 1024,
for a 1 MiB buffer.
-rw-r--r-- | checks/check.cpp | 2 | ||||
-rw-r--r-- | doc/examples/bench.cpp | 4 | ||||
-rw-r--r-- | doc/examples/benchmark.cpp | 2 | ||||
-rw-r--r-- | doc/examples/hash_quickly.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/checks/check.cpp b/checks/check.cpp index 4fa1160ae..e47cc543b 100644 --- a/checks/check.cpp +++ b/checks/check.cpp @@ -178,7 +178,7 @@ int main(int argc, char* argv[]) if(opts.is_set("buf-size")) { buf_size = std::atoi(opts.value("buf-size").c_str()); - if(buf_size == 0 || buf_size > 64*1024) + if(buf_size == 0 || buf_size > 1024) { std::cout << "Invalid argument to --buf-size\n"; return 2; diff --git a/doc/examples/bench.cpp b/doc/examples/bench.cpp index 20e6ec40b..6cfd9205f 100644 --- a/doc/examples/bench.cpp +++ b/doc/examples/bench.cpp @@ -70,11 +70,11 @@ const std::string algos[] = { void benchmark_algo(const std::string& algo, RandomNumberGenerator& rng) { - u32bit milliseconds = 3000; + u32bit milliseconds = 1000; Algorithm_Factory& af = global_state().algorithm_factory(); std::map<std::string, double> speeds = - algorithm_benchmark(algo, af, rng, milliseconds, 16*1024); + algorithm_benchmark(algo, af, rng, milliseconds, 16); std::cout << algo << ":"; diff --git a/doc/examples/benchmark.cpp b/doc/examples/benchmark.cpp index 7ad1775e2..b5adb3d4f 100644 --- a/doc/examples/benchmark.cpp +++ b/doc/examples/benchmark.cpp @@ -33,7 +33,7 @@ int main(int argc, char* argv[]) std::string algo = argv[i]; std::map<std::string, double> results = - algorithm_benchmark(algo, af, rng, ms, 16*1024); + algorithm_benchmark(algo, af, rng, ms, 16); std::cout << algo << ":\n"; for(std::map<std::string, double>::iterator r = results.begin(); diff --git a/doc/examples/hash_quickly.cpp b/doc/examples/hash_quickly.cpp index 005a6d719..a18ab4fa6 100644 --- a/doc/examples/hash_quickly.cpp +++ b/doc/examples/hash_quickly.cpp @@ -34,7 +34,7 @@ void set_fastest_implementation(const std::string& algo, Botan::Algorithm_Factory& af = Botan::global_state().algorithm_factory(); std::map<std::string, double> results = - Botan::algorithm_benchmark(algo, af, rng, ms, 16*1024); + Botan::algorithm_benchmark(algo, af, rng, ms, 16); std::string fastest_provider = ""; double best_res = 0; |