Remove benchmarks suffix

cpp/benchmarks/CMakeLists.txt

@@ -14,7 +14,7 @@
 
 find_package(Threads REQUIRED)
 
-add_library(cudf_datagen STATIC common/generate_benchmark_input.cpp)
+add_library(cudf_datagen STATIC common/generate_input.cpp)
 target_compile_features(cudf_datagen PUBLIC cxx_std_17 cuda_std_17)
 
 target_compile_options(
@@ -39,7 +39,7 @@ target_include_directories(
 # Use an OBJECT library so we only compile these helper source files only once
 add_library(
   cudf_benchmark_common OBJECT "${CUDF_SOURCE_DIR}/tests/utilities/base_fixture.cpp"
-                               synchronization/synchronization.cpp io/cuio_benchmark_common.cpp
+                               synchronization/synchronization.cpp io/cuio_common.cpp
 )
 target_link_libraries(cudf_benchmark_common PRIVATE cudf_datagen)
 add_custom_command(
@@ -86,194 +86,180 @@ endfunction()
 
 # ##################################################################################################
 # * column benchmarks -----------------------------------------------------------------------------
-ConfigureBench(COLUMN_CONCAT_BENCH column/concatenate_benchmark.cpp)
+ConfigureBench(COLUMN_CONCAT_BENCH column/concatenate.cpp)
 
 # ##################################################################################################
 # * gather benchmark ------------------------------------------------------------------------------
-ConfigureBench(GATHER_BENCH copying/gather_benchmark.cu)
+ConfigureBench(GATHER_BENCH copying/gather.cu)
 
 # ##################################################################################################
 # * scatter benchmark -----------------------------------------------------------------------------
-ConfigureBench(SCATTER_BENCH copying/scatter_benchmark.cu)
+ConfigureBench(SCATTER_BENCH copying/scatter.cu)
 
 # ##################################################################################################
 # * lists scatter benchmark -----------------------------------------------------------------------
-ConfigureBench(SCATTER_LISTS_BENCH lists/copying/scatter_lists_benchmark.cu)
+ConfigureBench(SCATTER_LISTS_BENCH lists/copying/scatter_lists.cu)
 
 # ##################################################################################################
 # * contiguous_split benchmark  -------------------------------------------------------------------
-ConfigureBench(CONTIGUOUS_SPLIT_BENCH copying/contiguous_split_benchmark.cu)
+ConfigureBench(CONTIGUOUS_SPLIT_BENCH copying/contiguous_split.cu)
 
 # ##################################################################################################
 # * shift benchmark -------------------------------------------------------------------------------
-ConfigureBench(SHIFT_BENCH copying/shift_benchmark.cu)
+ConfigureBench(SHIFT_BENCH copying/shift.cu)
 
 # ##################################################################################################
 # * copy-if-else benchmark
 # -----------------------------------------------------------------------------
-ConfigureBench(COPY_IF_ELSE_BENCH copying/copy_if_else_benchmark.cpp)
+ConfigureBench(COPY_IF_ELSE_BENCH copying/copy_if_else.cpp)
 
 # ##################################################################################################
 # * transpose benchmark ---------------------------------------------------------------------------
-ConfigureBench(TRANSPOSE_BENCH transpose/transpose_benchmark.cu)
+ConfigureBench(TRANSPOSE_BENCH transpose/transpose.cu)
 
 # ##################################################################################################
 # * apply_boolean_mask benchmark ------------------------------------------------------------------
-ConfigureBench(APPLY_BOOLEAN_MASK_BENCH stream_compaction/apply_boolean_mask_benchmark.cpp)
+ConfigureBench(APPLY_BOOLEAN_MASK_BENCH stream_compaction/apply_boolean_mask.cpp)
 
 # ##################################################################################################
 # * stream_compaction benchmark -------------------------------------------------------------------
-ConfigureBench(STREAM_COMPACTION_BENCH stream_compaction/drop_duplicates_benchmark.cpp)
+ConfigureBench(STREAM_COMPACTION_BENCH stream_compaction/drop_duplicates.cpp)
 
 # ##################################################################################################
 # * join benchmark --------------------------------------------------------------------------------
-ConfigureBench(JOIN_BENCH join/join_benchmark.cu join/conditional_join_benchmark.cu)
-ConfigureNVBench(JOIN_NVBENCH join/join_nvbench.cu)
+ConfigureBench(JOIN_BENCH join/left_join.cu join/conditional_join.cu)
+ConfigureNVBench(JOIN_NVBENCH join/join.cu)
 
 # ##################################################################################################
 # * iterator benchmark ----------------------------------------------------------------------------
-ConfigureBench(ITERATOR_BENCH iterator/iterator_benchmark.cu)
+ConfigureBench(ITERATOR_BENCH iterator/iterator.cu)
 
 # ##################################################################################################
 # * search benchmark ------------------------------------------------------------------------------
-ConfigureBench(SEARCH_BENCH search/search_benchmark.cpp)
+ConfigureBench(SEARCH_BENCH search/search.cpp)
 
 # ##################################################################################################
 # * sort benchmark --------------------------------------------------------------------------------
-ConfigureBench(
-  SORT_BENCH sort/rank_benchmark.cpp sort/sort_benchmark.cpp sort/sort_strings_benchmark.cpp
-)
+ConfigureBench(SORT_BENCH sort/rank.cpp sort/sort.cpp sort/sort_strings.cpp)
 
 # ##################################################################################################
 # * quantiles benchmark
 # --------------------------------------------------------------------------------
-ConfigureBench(QUANTILES_BENCH quantiles/quantiles_benchmark.cpp)
+ConfigureBench(QUANTILES_BENCH quantiles/quantiles.cpp)
 
 # ##################################################################################################
 # * type_dispatcher benchmark ---------------------------------------------------------------------
-ConfigureBench(TYPE_DISPATCHER_BENCH type_dispatcher/type_dispatcher_benchmark.cu)
+ConfigureBench(TYPE_DISPATCHER_BENCH type_dispatcher/type_dispatcher.cu)
 
 # ##################################################################################################
 # * reduction benchmark ---------------------------------------------------------------------------
 ConfigureBench(
-  REDUCTION_BENCH reduction/anyall_benchmark.cpp reduction/dictionary_benchmark.cpp
-  reduction/reduce_benchmark.cpp reduction/scan_benchmark.cpp reduction/minmax_benchmark.cpp
+  REDUCTION_BENCH reduction/anyall.cpp reduction/dictionary.cpp reduction/reduce.cpp
+  reduction/scan.cpp reduction/minmax.cpp
 )
 
 # ##################################################################################################
 # * reduction benchmark ---------------------------------------------------------------------------
-ConfigureBench(REPLACE_BENCH replace/clamp_benchmark.cpp replace/nans_benchmark.cpp)
+ConfigureBench(REPLACE_BENCH replace/clamp.cpp replace/nans.cpp)
 
 # ##################################################################################################
 # * filling benchmark -----------------------------------------------------------------------------
-ConfigureBench(FILL_BENCH filling/repeat_benchmark.cpp)
+ConfigureBench(FILL_BENCH filling/repeat.cpp)
 
 # ##################################################################################################
 # * groupby benchmark -----------------------------------------------------------------------------
 ConfigureBench(
-  GROUPBY_BENCH
-  groupby/group_sum_benchmark.cu
-  groupby/group_nth_benchmark.cu
-  groupby/group_shift_benchmark.cu
-  groupby/group_struct_benchmark.cu
-  groupby/group_no_requests_benchmark.cu
-  groupby/group_scan_benchmark.cu
+  GROUPBY_BENCH groupby/group_sum.cu groupby/group_nth.cu groupby/group_shift.cu
+  groupby/group_struct.cu groupby/group_no_requests.cu groupby/group_scan.cu
 )
 
 # ##################################################################################################
 # * hashing benchmark -----------------------------------------------------------------------------
-ConfigureBench(HASHING_BENCH hashing/hash_benchmark.cpp hashing/partition_benchmark.cpp)
+ConfigureBench(HASHING_BENCH hashing/hash.cpp hashing/partition.cpp)
 
 # ##################################################################################################
 # * merge benchmark -------------------------------------------------------------------------------
-ConfigureBench(MERGE_BENCH merge/merge_benchmark.cpp)
+ConfigureBench(MERGE_BENCH merge/merge.cpp)
 
 # ##################################################################################################
 # * null_mask benchmark ---------------------------------------------------------------------------
-ConfigureBench(NULLMASK_BENCH null_mask/set_null_mask_benchmark.cpp)
+ConfigureBench(NULLMASK_BENCH null_mask/set_null_mask.cpp)
 
 # ##################################################################################################
 # * parquet writer chunks benchmark ---------------------------------------------------------------
-ConfigureBench(PARQUET_WRITER_CHUNKS_BENCH io/parquet/parquet_writer_chunks_benchmark.cpp)
+ConfigureBench(PARQUET_WRITER_CHUNKS_BENCH io/parquet/parquet_writer_chunks.cpp)
 
 # ##################################################################################################
 # * parquet reader benchmark ----------------------------------------------------------------------
-ConfigureBench(PARQUET_READER_BENCH io/parquet/parquet_reader_benchmark.cpp)
+ConfigureBench(PARQUET_READER_BENCH io/parquet/parquet_reader.cpp)
 
 # ##################################################################################################
 # * orc reader benchmark --------------------------------------------------------------------------
-ConfigureBench(ORC_READER_BENCH io/orc/orc_reader_benchmark.cpp)
+ConfigureBench(ORC_READER_BENCH io/orc/orc_reader.cpp)
 
 # ##################################################################################################
 # * csv reader benchmark --------------------------------------------------------------------------
-ConfigureBench(CSV_READER_BENCH io/csv/csv_reader_benchmark.cpp)
+ConfigureBench(CSV_READER_BENCH io/csv/csv_reader.cpp)
 
 # ##################################################################################################
 # * parquet writer benchmark ----------------------------------------------------------------------
-ConfigureBench(PARQUET_WRITER_BENCH io/parquet/parquet_writer_benchmark.cpp)
+ConfigureBench(PARQUET_WRITER_BENCH io/parquet/parquet_writer.cpp)
 
 # ##################################################################################################
 # * orc writer benchmark --------------------------------------------------------------------------
-ConfigureBench(ORC_WRITER_BENCH io/orc/orc_writer_benchmark.cpp)
+ConfigureBench(ORC_WRITER_BENCH io/orc/orc_writer.cpp)
 
 # ##################################################################################################
 # * csv writer benchmark --------------------------------------------------------------------------
-ConfigureBench(CSV_WRITER_BENCH io/csv/csv_writer_benchmark.cpp)
+ConfigureBench(CSV_WRITER_BENCH io/csv/csv_writer.cpp)
 
 # ##################################################################################################
 # * ast benchmark ---------------------------------------------------------------------------------
-ConfigureBench(AST_BENCH ast/transform_benchmark.cpp)
+ConfigureBench(AST_BENCH ast/transform.cpp)
 
 # ##################################################################################################
 # * binaryop benchmark ----------------------------------------------------------------------------
-ConfigureBench(
-  BINARYOP_BENCH binaryop/binaryop_benchmark.cpp binaryop/compiled_binaryop_benchmark.cpp
-)
+ConfigureBench(BINARYOP_BENCH binaryop/binaryop.cpp binaryop/compiled_binaryop.cpp)
 
 # ##################################################################################################
 # * nvtext benchmark -------------------------------------------------------------------
 ConfigureBench(
-  TEXT_BENCH
-  text/ngrams_benchmark.cpp
-  text/normalize_benchmark.cpp
-  text/normalize_spaces_benchmark.cpp
-  text/replace_benchmark.cpp
-  text/subword_benchmark.cpp
-  text/tokenize_benchmark.cpp
+  TEXT_BENCH text/ngrams.cpp text/normalize.cpp text/normalize_spaces.cpp text/replace.cpp
+  text/subword.cpp text/tokenize.cpp
 )
 
 # ##################################################################################################
 # * strings benchmark -------------------------------------------------------------------
 ConfigureBench(
   STRINGS_BENCH
-  string/case_benchmark.cpp
-  string/combine_benchmark.cpp
-  string/contains_benchmark.cpp
-  string/convert_datetime_benchmark.cpp
-  string/convert_durations_benchmark.cpp
-  string/convert_fixed_point_benchmark.cpp
-  string/convert_numerics_benchmark.cpp
-  string/copy_benchmark.cpp
-  string/extract_benchmark.cpp
-  string/factory_benchmark.cu
-  string/filter_benchmark.cpp
-  string/find_benchmark.cpp
-  string/repeat_strings_benchmark.cpp
-  string/replace_benchmark.cpp
-  string/replace_re_benchmark.cpp
-  string/split_benchmark.cpp
-  string/substring_benchmark.cpp
-  string/translate_benchmark.cpp
-  string/url_decode_benchmark.cpp
+  string/case.cpp
+  string/combine.cpp
+  string/contains.cpp
+  string/convert_datetime.cpp
+  string/convert_durations.cpp
+  string/convert_fixed_point.cpp
+  string/convert_numerics.cpp
+  string/copy.cpp
+  string/extract.cpp
+  string/factory.cu
+  string/filter.cpp
+  string/find.cpp
+  string/repeat_strings.cpp
+  string/replace.cpp
+  string/replace_re.cpp
+  string/split.cpp
+  string/substring.cpp
+  string/translate.cpp
+  string/url_decode.cpp
 )
 
 # ##################################################################################################
 # * json benchmark -------------------------------------------------------------------
-ConfigureBench(JSON_BENCH string/json_benchmark.cpp)
+ConfigureBench(JSON_BENCH string/json.cpp)
 
 # ##################################################################################################
 # * io benchmark ---------------------------------------------------------------------
-ConfigureBench(MULTIBYTE_SPLIT_BENCHMARK io/text/multibyte_split_benchmark.cpp)
+ConfigureBench(MULTIBYTE_SPLIT_BENCHMARK io/text/multibyte_split.cpp)
 
 add_custom_target(
   run_benchmarks

cpp/benchmarks/common/generate_benchmark_input.cpp → cpp/benchmarks/common/generate_input.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "generate_benchmark_input.hpp"
+#include "generate_input.hpp"
 #include "random_distribution_factory.hpp"
 
 #include <cudf/column/column.hpp>

cpp/benchmarks/common/generate_benchmark_input.hpp → cpp/benchmarks/common/generate_input.hpp

@@ -22,7 +22,7 @@
 #include <cudf/utilities/traits.hpp>
 
 /**
- * @file generate_benchmark_input.hpp
+ * @file generate_input.hpp
  * @brief Contains declarations of functions that generate columns filled with random data.
  *
  * Also includes the data profile descriptor classes.

cpp/benchmarks/common/random_distribution_factory.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "generate_benchmark_input.hpp"
+#include "generate_input.hpp"
 
 #include <memory>
 #include <random>

cpp/benchmarks/copying/copy_if_else_benchmark.cpp → cpp/benchmarks/copying/copy_if_else.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <benchmark/benchmark.h>
-#include <benchmarks/common/generate_benchmark_input.hpp>
+#include <benchmarks/common/generate_input.hpp>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 

cpp/benchmarks/groupby/group_no_requests_benchmark.cu → cpp/benchmarks/groupby/group_no_requests.cu

@@ -15,7 +15,7 @@
  */
 
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/groupby/group_benchmark_common.hpp>
+#include <benchmarks/groupby/group_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/copying.hpp>

cpp/benchmarks/groupby/group_nth_benchmark.cu → cpp/benchmarks/groupby/group_nth.cu

@@ -15,7 +15,7 @@
  */
 
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/groupby/group_benchmark_common.hpp>
+#include <benchmarks/groupby/group_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/copying.hpp>

cpp/benchmarks/groupby/group_scan_benchmark.cu → cpp/benchmarks/groupby/group_scan.cu

@@ -15,7 +15,7 @@
  */
 
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/groupby/group_benchmark_common.hpp>
+#include <benchmarks/groupby/group_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/copying.hpp>

cpp/benchmarks/groupby/group_shift_benchmark.cu → cpp/benchmarks/groupby/group_shift.cu

@@ -15,7 +15,7 @@
  */
 
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/groupby/group_benchmark_common.hpp>
+#include <benchmarks/groupby/group_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/detail/iterator.cuh>

cpp/benchmarks/groupby/group_struct_benchmark.cu → cpp/benchmarks/groupby/group_struct.cu

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <benchmarks/common/generate_benchmark_input.hpp>
+#include <benchmarks/common/generate_input.hpp>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 

cpp/benchmarks/groupby/group_sum_benchmark.cu → cpp/benchmarks/groupby/group_sum.cu

@@ -15,7 +15,7 @@
  */
 
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/groupby/group_benchmark_common.hpp>
+#include <benchmarks/groupby/group_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/copying.hpp>

cpp/benchmarks/hashing/hash_benchmark.cpp → cpp/benchmarks/hashing/hash.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <benchmark/benchmark.h>
-#include <benchmarks/common/generate_benchmark_input.hpp>
+#include <benchmarks/common/generate_input.hpp>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 

cpp/benchmarks/io/csv/csv_reader_benchmark.cpp → cpp/benchmarks/io/csv/csv_reader.cpp

@@ -16,9 +16,9 @@
 
 #include <benchmark/benchmark.h>
 
-#include <benchmarks/common/generate_benchmark_input.hpp>
+#include <benchmarks/common/generate_input.hpp>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/io/cuio_benchmark_common.hpp>
+#include <benchmarks/io/cuio_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/io/csv.hpp>

cpp/benchmarks/io/csv/csv_writer_benchmark.cpp → cpp/benchmarks/io/csv/csv_writer.cpp

@@ -16,9 +16,9 @@
 
 #include <benchmark/benchmark.h>
 
-#include <benchmarks/common/generate_benchmark_input.hpp>
+#include <benchmarks/common/generate_input.hpp>
 #include <benchmarks/fixture/benchmark_fixture.hpp>
-#include <benchmarks/io/cuio_benchmark_common.hpp>
+#include <benchmarks/io/cuio_common.hpp>
 #include <benchmarks/synchronization/synchronization.hpp>
 
 #include <cudf/io/csv.hpp>