rocThrust rename benchmark folder

projects/rocthrust/.gitlab-ci.yml

@@ -227,7 +227,7 @@ build:windows:
       -D GPU_TARGETS=$GPU_TARGET
       -D BUILD_TEST=ON
       -D BUILD_EXAMPLES=OFF
-      -D BUILD_BENCHMARKS=OFF
+      -D BUILD_BENCHMARK=OFF
       -D CMAKE_CXX_FLAGS=-Wno-deprecated-declarations
       -D CMAKE_CXX_COMPILER:FILEPATH="${env:HIP_PATH}/bin/clang++.exe"
       -D CMAKE_INSTALL_PREFIX:PATH="$CI_PROJECT_DIR/build/install"

projects/rocthrust/CMakeLists.txt

@@ -44,9 +44,9 @@ option(CODE_COVERAGE "Enable code coverage" OFF)
 option(BUILD_HIPSTDPAR_TEST "Build hipstdpar tests" OFF)
 option(BUILD_HIPSTDPAR_TEST_WITH_TBB "Build hipstdpar tests with TBB" OFF)
 option(BUILD_EXAMPLES "Build examples" OFF)
-option(BUILD_BENCHMARKS "Build benchmarks" OFF)
+option(BUILD_BENCHMARK "Build benchmark" OFF)
 option(DOWNLOAD_ROCPRIM "Download rocPRIM and do not search for rocPRIM package" OFF)
-cmake_dependent_option(DOWNLOAD_ROCRAND "Download rocRAND and do not search for rocRAND package" OFF BUILD_BENCHMARKS OFF)
+cmake_dependent_option(DOWNLOAD_ROCRAND "Download rocRAND and do not search for rocRAND package" OFF BUILD_BENCHMARK OFF)
 option(DOWNLOAD_ROCRAND "Download rocRAND and do not search for rocRAND package" OFF)
 option(BUILD_ADDRESS_SANITIZER "Build with address sanitizer enabled" OFF)
 cmake_dependent_option(ENABLE_UPSTREAM_TESTS "Enable upstream (thrust) tests" ON BUILD_TEST OFF)
@@ -169,7 +169,7 @@ math(EXPR rocthrust_VERSION_NUMBER "${rocthrust_VERSION_MAJOR} * 100000 + ${roct
 # Thrust (with HIP backend)
 add_subdirectory(thrust)
 
-if(BUILD_TEST OR BUILD_BENCHMARKS OR BUILD_HIPSTDPAR_TEST)
+if(BUILD_TEST OR BUILD_BENCHMARK OR BUILD_HIPSTDPAR_TEST)
   rocm_package_setup_component(clients)
 endif()
 
@@ -198,9 +198,9 @@ if(BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
-# Benchmarks
-if(BUILD_BENCHMARKS)
-  add_subdirectory(benchmarks)
+# Benchmark
+if(BUILD_BENCHMARK)
+  add_subdirectory(benchmark)
 endif()
 
 #Create header wrapper for backward compatibility

projects/rocthrust/README.md

@@ -49,7 +49,7 @@ cd rocThrust; mkdir build; cd build
 #   BUILD_TEST            - OFF by default,
 #   BUILD_HIPSTDPAR_TEST  - OFF by default,
 #   BUILD_EXAMPLES        - OFF by default,
-#   BUILD_BENCHMARKS      - OFF by default,
+#   BUILD_BENCHMARK      - OFF by default,
 #   DOWNLOAD_ROCPRIM      - OFF by default, when ON rocPRIM will be downloaded to the build folder,
 #   RNG_SEED_COUNT        - 0 by default, controls non-repeatable random dataset count
 #   PRNG_SEEDS            - 1 by default, reproducible seeds to generate random data
@@ -238,7 +238,7 @@ make -j4
 cd rocThrust; cd build
 
 # Configure with benchmarks flag on
-CXX=hipcc cmake -DBUILD_BENCHMARKS=ON ..
+CXX=hipcc cmake -DBUILD_BENCHMARK=ON ..
 
 # Build benchmarks
 make -j4

projects/rocthrust/benchmarks/bench/transform/basic.cu → projects/rocthrust/benchmark/bench/transform/basic.cu

@@ -33,7 +33,7 @@
 
 // Google Benchmark
 #include <benchmark/benchmark.h>
-#include <benchmarks/bench_utils/common/types.hpp>
+#include <benchmark/bench_utils/common/types.hpp>
 
 // STL
 #include <cstdlib>

projects/rocthrust/cmake/Benchmarks.cmake

@@ -48,9 +48,9 @@ function(add_thrust_benchmark BENCHMARK_NAME BENCHMARK_SOURCE NOT_INTERNAL)
 
     # Separate normal from internal benchmarks
     if(NOT_INTERNAL)
-        set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/benchmarks/")
+        set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/benchmark/")
     else()
-        set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/benchmarks/internal/")
+        set(OUTPUT_DIR "${CMAKE_BINARY_DIR}/benchmark/internal/")
     endif()
 
     set_target_properties(${BENCHMARK_TARGET}

projects/rocthrust/cmake/Dependencies.cmake

@@ -134,7 +134,7 @@ if(BUILD_TEST OR BUILD_HIPSTDPAR_TEST)
 endif()
 
 # Benchmark dependencies
-if(BUILD_BENCHMARKS)
+if(BUILD_BENCHMARK)
   set(BENCHMARK_VERSION 1.9.0)
   if(NOT DEPENDENCIES_FORCE_DOWNLOAD)
     # Google Benchmark (https://github.com/google/benchmark.git)

projects/rocthrust/cmake/Summary.cmake

@@ -98,8 +98,8 @@ endif()
     message(STATUS "  BUILD_HIPSTDPAR_TEST            : ${BUILD_HIPSTDPAR_TEST}")
     message(STATUS "  BUILD_HIPSTDPAR_TEST_WITH_TBB   : ${BUILD_HIPSTDPAR_TEST_WITH_TBB}")
     message(STATUS "  BUILD_EXAMPLES                  : ${BUILD_EXAMPLES}")
-    message(STATUS "  BUILD_BENCHMARKS                : ${BUILD_BENCHMARKS}")
-if(BUILD_BENCHMARKS)
+    message(STATUS "  BUILD_BENCHMARK                 : ${BUILD_BENCHMARK}")
+if(BUILD_BENCHMARK)
     message(STATUS "  DOWNLOAD_ROCRAND                : ${DOWNLOAD_ROCRAND}")
 endif()
     message(STATUS "  BUILD_ADDRESS_SANITIZER         : ${BUILD_ADDRESS_SANITIZER}")

projects/rocthrust/rmake.py

@@ -157,7 +157,7 @@ def config_cmd():
         cmake_options.append( f"-DROCM_DISABLE_LDCONFIG=ON" )
 
     if args.build_clients:
-        cmake_options.append( f"-DBUILD_TEST=ON -DBUILD_BENCHMARKS=ON -DBUILD_DIR={build_dir}" )
+        cmake_options.append( f"-DBUILD_TEST=ON -DBUILD_BENCHMARK=ON -DBUILD_DIR={build_dir}" )
 
     cmake_options.append( f"-DAMDGPU_TARGETS={args.gpu_architecture}" )