Skip to content

Commit

Permalink
nvbench executables now build with a custom nvbench main
Browse files Browse the repository at this point in the history
This ensures that the `nvbench_base_fixture` we need, is constructed
before any benchmark is run.
  • Loading branch information
robertmaynard committed Apr 20, 2023
1 parent b233b55 commit 4dc46a0
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
4 changes: 2 additions & 2 deletions cpp/benchmarks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ endfunction()
# This function takes in a benchmark name and benchmark source for nvbench benchmarks and handles
# setting all of the associated properties and linking to build the benchmark
function(ConfigureNVBench CMAKE_BENCH_NAME)
add_executable(${CMAKE_BENCH_NAME} ${ARGN})
add_executable(${CMAKE_BENCH_NAME} ${ARGN} fixture/nvbench_main.cu)
set_target_properties(
${CMAKE_BENCH_NAME}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<BUILD_INTERFACE:${CUDF_BINARY_DIR}/benchmarks>"
INSTALL_RPATH "\$ORIGIN/../../../lib"
)
target_link_libraries(
${CMAKE_BENCH_NAME} PRIVATE cudf_benchmark_common cudf_datagen nvbench::main
${CMAKE_BENCH_NAME} PRIVATE cudf_benchmark_common cudf_datagen nvbench::nvbench
$<TARGET_NAME_IF_EXISTS:conda_env>
)
install(
Expand Down
22 changes: 22 additions & 0 deletions cpp/benchmarks/fixture/nvbench_main.cu
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <benchmarks/fixture/rmm_pool_raii.hpp>
#define NVBENCH_ENVIRONMENT cudf::nvbench_base_fixture

#include <nvbench/main.cuh>

NVBENCH_MAIN
2 changes: 0 additions & 2 deletions cpp/benchmarks/fixture/rmm_pool_raii.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,3 @@ struct nvbench_base_fixture {
};

} // namespace cudf

#define NVBENCH_ENVIRONMENT cudf::nvbench_base_fixture
2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/patches/nvbench_global_setup.diff
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 0ba82d7..7ab02c1 100644
printer.set_total_state_count(total_states); \
\
printer.set_completed_state_count(0); \
+ NVBENCH_ENVIRONMENT(); \
+ auto env_state = NVBENCH_ENVIRONMENT(); \
for (auto &bench_ptr : benchmarks) \
{ \
bench_ptr->set_printer(printer); \

0 comments on commit 4dc46a0

Please sign in to comment.