diff options
| -rw-r--r-- | src/utilities/utilities.hpp | 2 | ||||
| -rw-r--r-- | test/performance/client.cpp | 10 | ||||
| -rw-r--r-- | test/routines/levelx/xaxpybatched.hpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/utilities/utilities.hpp b/src/utilities/utilities.hpp index 58dc3b27..851fa251 100644 --- a/src/utilities/utilities.hpp +++ b/src/utilities/utilities.hpp @@ -73,7 +73,7 @@ constexpr auto kArgAsumOffset = "offasum"; constexpr auto kArgImaxOffset = "offimax"; constexpr auto kArgAlpha = "alpha"; constexpr auto kArgBeta = "beta"; -constexpr auto kArgBatchCount = "batch_count"; +constexpr auto kArgBatchCount = "batch_num"; // The tuner-specific arguments in string form constexpr auto kArgFraction = "fraction"; diff --git a/test/performance/client.cpp b/test/performance/client.cpp index b1d5b718..2b4cdb9b 100644 --- a/test/performance/client.cpp +++ b/test/performance/client.cpp @@ -91,12 +91,12 @@ Arguments<U> Client<T,U>::ParseArguments(int argc, char *argv[], const size_t le if (o == kArgAsumOffset) { args.asum_offset = GetArgument(command_line_args, help, kArgAsumOffset, size_t{0}); } if (o == kArgImaxOffset) { args.imax_offset = GetArgument(command_line_args, help, kArgImaxOffset, size_t{0}); } + // Batch arguments + if (o == kArgBatchCount) { args.batch_count = GetArgument(command_line_args, help, kArgBatchCount, size_t{1}); } + // Scalar values if (o == kArgAlpha) { args.alpha = GetArgument(command_line_args, help, kArgAlpha, GetScalar<U>()); } if (o == kArgBeta) { args.beta = GetArgument(command_line_args, help, kArgBeta, GetScalar<U>()); } - - // Batch arguments - if (o == kArgBatchCount) { args.batch_count = GetArgument(command_line_args, help, kArgBatchCount, size_t{1}); } } // These are the options common to all routines @@ -373,8 +373,8 @@ void Client<T,U>::PrintTableRow(const Arguments<U>& args, for (const auto& timing : timings) { // Computes the GFLOPS and GB/s metrics - auto flops = get_flops_(args); - auto bytes = get_bytes_(args); + auto flops = get_flops_(args) * args.batch_count; + auto bytes = get_bytes_(args) * args.batch_count; auto gflops = (timing.second != 0.0) ? (flops*1e-6)/timing.second : 0; auto gbs = (timing.second != 0.0) ? (bytes*1e-6)/timing.second : 0; diff --git a/test/routines/levelx/xaxpybatched.hpp b/test/routines/levelx/xaxpybatched.hpp index 181b401c..7922359d 100644 --- a/test/routines/levelx/xaxpybatched.hpp +++ b/test/routines/levelx/xaxpybatched.hpp @@ -43,7 +43,7 @@ class TestXaxpyBatched { static std::vector<std::string> GetOptions() { return {kArgN, kArgXInc, kArgYInc, - kArgAlpha, kArgBatchCount}; + kArgBatchCount, kArgAlpha}; } // Helper to determine a different alpha value per batch |