ensure the logger log proper stuff

yhmtsai · yhmtsai · commit 156a08130264 · 2025-07-30T11:06:23.000+02:00
diff --git a/benchmark/preconditioner/preconditioner.cpp b/benchmark/preconditioner/preconditioner.cpp
@@ -225,7 +225,6 @@ struct PreconditionerBenchmark : Benchmark<preconditioner_benchmark_state> {
             auto x_clone = clone(state.x);
             auto precond = precond_factory.at(decoded_precond_name)(exec);
 
-            std::unique_ptr<gko::LinOp> precond_op;
             {
                 auto gen_logger = create_operations_logger(
                     FLAGS_gpu_timer, FLAGS_nested_names, exec,
@@ -236,14 +235,17 @@ struct PreconditionerBenchmark : Benchmark<preconditioner_benchmark_state> {
                     exec->get_master()->add_logger(gen_logger);
                 }
                 for (auto i = 0u; i < ic_gen.get_num_repetitions(); ++i) {
-                    precond_op = precond->generate(state.system_matrix);
+                    auto precond_op = precond->generate(state.system_matrix);
                 }
                 if (exec->get_master() != exec) {
                     exec->get_master()->remove_logger(gen_logger);
                 }
                 exec->remove_logger(gen_logger);
             }
 
+            // generate it for apply usage
+            auto precond_op = precond->generate(state.system_matrix);
+
             auto apply_logger = create_operations_logger(
                 FLAGS_gpu_timer, FLAGS_nested_names, exec,
                 precond_case["apply"]["components"],
diff --git a/benchmark/solver/solver_common.hpp b/benchmark/solver/solver_common.hpp
@@ -506,7 +506,6 @@ struct SolverBenchmark : Benchmark<solver_benchmark_state<Generator>> {
         if (FLAGS_detailed && !FLAGS_overhead) {
             // slow run, get the time of each functions
             auto x_clone = clone(state.x);
-            std::shared_ptr<gko::LinOp> detailed_solver;
             {
                 auto gen_logger = create_operations_logger(
                     FLAGS_gpu_timer, FLAGS_nested_names, exec,
@@ -516,17 +515,25 @@ struct SolverBenchmark : Benchmark<solver_benchmark_state<Generator>> {
                     exec->get_master()->add_logger(gen_logger);
                 }
 
-                auto precond = precond_factory.at(precond_name)(exec);
-                detailed_solver = generate_solver(exec, give(precond),
+                {
+                    auto precond = precond_factory.at(precond_name)(exec);
+                    auto solver = generate_solver(exec, give(precond),
                                                   solver_name, FLAGS_max_iters)
                                       ->generate(state.system_matrix);
+                }
 
                 exec->remove_logger(gen_logger);
                 if (exec != exec->get_master()) {
                     exec->get_master()->remove_logger(gen_logger);
                 }
             }
 
+            // generate it for apply usage
+            auto precond = precond_factory.at(precond_name)(exec);
+            auto detailed_solver = generate_solver(exec, give(precond),
+                                                   solver_name, FLAGS_max_iters)
+                                       ->generate(state.system_matrix);
+
             if (auto prec = dynamic_cast<const gko::Preconditionable*>(
                     detailed_solver.get())) {
                 solver_case["preconditioner"] = json::object();
diff --git a/benchmark/test/reference/distributed_solver.matrix.stdout b/benchmark/test/reference/distributed_solver.matrix.stdout
@@ -14,7 +14,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0
diff --git a/benchmark/test/reference/distributed_solver.simple.stdout b/benchmark/test/reference/distributed_solver.simple.stdout
@@ -16,7 +16,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0
diff --git a/benchmark/test/reference/distributed_solver_dcomplex.simple.stdout b/benchmark/test/reference/distributed_solver_dcomplex.simple.stdout
@@ -16,7 +16,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0
diff --git a/benchmark/test/reference/solver.matrix.stdout b/benchmark/test/reference/solver.matrix.stdout
@@ -14,7 +14,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0
diff --git a/benchmark/test/reference/solver.reordered.stdout b/benchmark/test/reference/solver.reordered.stdout
@@ -15,7 +15,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0
diff --git a/benchmark/test/reference/solver.simple.stdout b/benchmark/test/reference/solver.simple.stdout
@@ -15,7 +15,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0
diff --git a/benchmark/test/reference/solver_dcomplex.simple.stdout b/benchmark/test/reference/solver_dcomplex.simple.stdout
@@ -15,7 +15,6 @@
                 "generate": {
                     "components": {
                         "generate(<typename>)": 1.0,
-                        "free": 1.0,
                         "overhead": 1.0
                     },
                     "time": 1.0

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,6 @@ struct PreconditionerBenchmark : Benchmark<preconditioner_benchmark_state> {`
`225`	`225`	`auto x_clone = clone(state.x);`
`226`	`226`	`auto precond = precond_factory.at(decoded_precond_name)(exec);`
`227`	`227`
`228`		`- std::unique_ptr<gko::LinOp> precond_op;`
`229`	`228`	`{`
`230`	`229`	`auto gen_logger = create_operations_logger(`
`231`	`230`	`FLAGS_gpu_timer, FLAGS_nested_names, exec,`
`@@ -236,14 +235,17 @@ struct PreconditionerBenchmark : Benchmark<preconditioner_benchmark_state> {`
`236`	`235`	`exec->get_master()->add_logger(gen_logger);`
`237`	`236`	`}`
`238`	`237`	`for (auto i = 0u; i < ic_gen.get_num_repetitions(); ++i) {`
`239`		`- precond_op = precond->generate(state.system_matrix);`
	`238`	`+ auto precond_op = precond->generate(state.system_matrix);`
`240`	`239`	`}`
`241`	`240`	`if (exec->get_master() != exec) {`
`242`	`241`	`exec->get_master()->remove_logger(gen_logger);`
`243`	`242`	`}`
`244`	`243`	`exec->remove_logger(gen_logger);`
`245`	`244`	`}`
`246`	`245`
	`246`	`+ // generate it for apply usage`
	`247`	`+ auto precond_op = precond->generate(state.system_matrix);`
	`248`	`+`
`247`	`249`	`auto apply_logger = create_operations_logger(`
`248`	`250`	`FLAGS_gpu_timer, FLAGS_nested_names, exec,`
`249`	`251`	`precond_case["apply"]["components"],`