Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions benchmark/solver/solver_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,8 @@ struct SolverBenchmark : Benchmark<solver_benchmark_state<Generator>> {
for (auto stage : {"generate", "apply"}) {
solver_case[stage] = json::object();
solver_case[stage]["components"] = json::object();
solver_case[stage]["components"]["gpu"] = json::object();
solver_case[stage]["components"]["cpu"] = json::object();
}

IterationControl ic{timer};
Expand Down Expand Up @@ -529,19 +531,44 @@ struct SolverBenchmark : Benchmark<solver_benchmark_state<Generator>> {
}

{
auto apply_logger = create_operations_logger(
FLAGS_gpu_timer, FLAGS_nested_names, exec,
solver_case["apply"]["components"], 1);
exec->add_logger(apply_logger);
if (exec != exec->get_master()) {
exec->get_master()->add_logger(apply_logger);
std::shared_ptr<gko::log::ProfilerHook> apply_gpu_logger =
nullptr;
std::shared_ptr<gko::log::ProfilerHook> apply_cpu_logger =
nullptr;

if (FLAGS_gpu_timer) {
apply_gpu_logger = create_operations_logger(
true, FLAGS_nested_names, exec,
solver_case["apply"]["components"]["gpu"], 1);
}
if (FLAGS_cpu_timer) {
apply_cpu_logger = create_operations_logger(
false, FLAGS_nested_names, exec,
solver_case["apply"]["components"]["cpu"], 1);
}

// we have cpu activity from executor and master executor
if (FLAGS_cpu_timer) {
exec->add_logger(apply_cpu_logger);
if (exec != exec->get_master()) {
exec->get_master()->add_logger(apply_cpu_logger);
}
}
// we only have gpu activity when the executor is on accelerator
if (FLAGS_gpu_timer && exec != exec->get_master()) {
exec->add_logger(apply_gpu_logger);
}

solver->apply(state.b, x_clone);

exec->remove_logger(apply_logger);
if (exec != exec->get_master()) {
exec->get_master()->remove_logger(apply_logger);
if (FLAGS_cpu_timer) {
exec->remove_logger(apply_cpu_logger);
if (exec != exec->get_master()) {
exec->get_master()->remove_logger(apply_cpu_logger);
}
}
if (exec != exec->get_master() && FLAGS_gpu_timer) {
exec->remove_logger(apply_gpu_logger);
}
}

Expand Down
48 changes: 27 additions & 21 deletions benchmark/test/reference/solver.matrix.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,38 @@
"rhs_norm": 1.0,
"generate": {
"components": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"time": 1.0
},
"apply": {
"components": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"iterations": 27,
"time": 1.0
Expand Down
10 changes: 8 additions & 2 deletions benchmark/test/reference/solver.profile.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@
"iteration_timestamps": [],
"rhs_norm": 1.0,
"generate": {
"components": {},
"components": {
"gpu": {},
"cpu": {}
},
"time": 1.0
},
"apply": {
"components": {},
"components": {
"gpu": {},
"cpu": {}
},
"iterations": 7,
"time": 1.0
},
Expand Down
48 changes: 27 additions & 21 deletions benchmark/test/reference/solver.reordered.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,38 @@
"rhs_norm": 1.0,
"generate": {
"components": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"time": 1.0
},
"apply": {
"components": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"iterations": 7,
"time": 1.0
Expand Down
48 changes: 27 additions & 21 deletions benchmark/test/reference/solver.simple.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,38 @@
"rhs_norm": 1.0,
"generate": {
"components": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"time": 1.0
},
"apply": {
"components": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"iterations": 7,
"time": 1.0
Expand Down
48 changes: 27 additions & 21 deletions benchmark/test/reference/solver_dcomplex.simple.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,38 @@
"rhs_norm": 1.0,
"generate": {
"components": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"generate(<typename>)": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"time": 1.0
},
"apply": {
"components": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
"gpu": {},
"cpu": {
"apply(<typename>)": 1.0,
"iteration": 1.0,
"allocate": 1.0,
"dense::fill": 1.0,
"cg::initialize": 1.0,
"advanced_apply(<typename>)": 1.0,
"csr::advanced_spmv": 1.0,
"dense::compute_norm2_dispatch": 1.0,
"copy(<typename>)": 1.0,
"dense::copy": 1.0,
"dense::compute_conj_dot_dispatch": 1.0,
"check(<typename>)": 1.0,
"residual_norm::residual_norm": 1.0,
"cg::step_1": 1.0,
"csr::spmv": 1.0,
"cg::step_2": 1.0,
"free": 1.0,
"overhead": 1.0
}
},
"iterations": 7,
"time": 1.0
Expand Down
4 changes: 3 additions & 1 deletion benchmark/utils/timer.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2017 - 2024 The Ginkgo authors
// SPDX-FileCopyrightText: 2017 - 2025 The Ginkgo authors
//
// SPDX-License-Identifier: BSD-3-Clause

Expand All @@ -20,6 +20,8 @@ DEFINE_bool(gpu_timer, false,
"use gpu timer based on event. It is valid only when "
"executor is cuda or hip");

DEFINE_bool(cpu_timer, true, "use cpu timer based on steady_clock. note: it will only capture the launch overhead or get accumulated time during synchronization when executor is on accelerators");

DEFINE_string(
timer_method, "average",
"The statistical method for output of timer. Available options: "
Expand Down
Loading