From 79b42cff580c7fe77b36c160579d5c252bc69d66 Mon Sep 17 00:00:00 2001 From: Matthew Barr Date: Wed, 14 Jun 2017 09:04:43 +1000 Subject: [PATCH] hsbench: make output more clear --- tools/hsbench/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/hsbench/main.cpp b/tools/hsbench/main.cpp index 2d92cd84..b8c7b7dd 100644 --- a/tools/hsbench/main.cpp +++ b/tools/hsbench/main.cpp @@ -651,8 +651,8 @@ void displayResults(const vector> &threads, } } - printf("Time spent scanning: %'0.3f seconds\n", totalSecs); - printf("Corpus size: %'llu bytes ", bytesPerRun); + printf("Time spent scanning: %'0.3f seconds\n", totalSecs); + printf("Corpus size: %'llu bytes ", bytesPerRun); switch (scan_mode) { case ScanMode::STREAMING: printf("(%'zu blocks in %'llu streams)\n", corpus_blocks.size(), @@ -671,16 +671,16 @@ void displayResults(const vector> &threads, u64a totalBlocks = corpus_blocks.size() * repeats * threads.size(); double matchRate = ((double)matchesPerRun * 1024) / bytesPerRun; - printf("Matches per iteration: %'llu (%'0.3f matches/kilobyte)\n", + printf("Matches per iteration: %'llu (%'0.3f matches/kilobyte)\n", matchesPerRun, matchRate); double blockRate = (double)totalBlocks / (double)totalSecs; - printf("Overall block rate: %'0.2f blocks/sec\n", blockRate); - printf("Mean throughput: %'0.2Lf Mbit/sec\n", + printf("Overall block rate: %'0.2f blocks/sec\n", blockRate); + printf("Mean throughput (overall): %'0.2Lf Mbit/sec\n", calc_mbps(totalSecs, totalBytes)); double lowestScanTime = fastestResult(threads); - printf("Maximum throughput: %'0.2Lf Mbit/sec\n", + printf("Max throughput (per core): %'0.2Lf Mbit/sec\n", calc_mbps(lowestScanTime, bytesPerRun)); printf("\n");