Skip to content

Commit

Permalink
Move kernel vis over to CUDF_HIDDEN (#16165)
Browse files Browse the repository at this point in the history
Use CUDF_HIDDEN instead of the raw `__attribute__((visibility("hidden")))`  for symbol visibility controls on the CUDA kernels that we call from multiple TUs.  This is primarily a style change so that we have consistent visibility markup across the entire project

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Yunsong Wang (https://github.com/PointKernel)
  - David Wendt (https://github.com/davidwendt)

URL: #16165
  • Loading branch information
robertmaynard authored Jul 17, 2024
1 parent 093bcc9 commit aa466aa
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
3 changes: 2 additions & 1 deletion cpp/src/join/mixed_join_kernel.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <cudf/ast/detail/expression_parser.hpp>
#include <cudf/detail/utilities/cuda.cuh>
#include <cudf/table/table_device_view.cuh>
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <cooperative_groups.h>
Expand All @@ -38,7 +39,7 @@ namespace cg = cooperative_groups;
#pragma GCC diagnostic ignored "-Wattributes"

template <cudf::size_type block_size, bool has_nulls>
__attribute__((visibility("hidden"))) __launch_bounds__(block_size) __global__
CUDF_HIDDEN __launch_bounds__(block_size) __global__
void mixed_join(table_device_view left_table,
table_device_view right_table,
table_device_view probe,
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/join/mixed_join_kernels_semi.cu
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <cudf/ast/detail/expression_parser.hpp>
#include <cudf/detail/utilities/cuda.cuh>
#include <cudf/table/table_device_view.cuh>
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <cub/cub.cuh>
Expand All @@ -34,7 +35,7 @@ namespace cg = cooperative_groups;
#pragma GCC diagnostic ignored "-Wattributes"

template <cudf::size_type block_size, bool has_nulls>
__attribute__((visibility("hidden"))) __launch_bounds__(block_size) __global__
CUDF_HIDDEN __launch_bounds__(block_size) __global__
void mixed_join_semi(table_device_view left_table,
table_device_view right_table,
table_device_view probe,
Expand Down
28 changes: 14 additions & 14 deletions cpp/src/join/mixed_join_size_kernel.cuh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <cudf/ast/detail/expression_parser.hpp>
#include <cudf/detail/utilities/cuda.cuh>
#include <cudf/table/table_device_view.cuh>
#include <cudf/utilities/export.hpp>
#include <cudf/utilities/span.hpp>

#include <cooperative_groups.h>
Expand All @@ -35,20 +36,19 @@ namespace cg = cooperative_groups;
#pragma GCC diagnostic ignored "-Wattributes"

template <int block_size, bool has_nulls>
__attribute__((visibility("hidden"))) __launch_bounds__(block_size) __global__
void compute_mixed_join_output_size(
table_device_view left_table,
table_device_view right_table,
table_device_view probe,
table_device_view build,
row_hash const hash_probe,
row_equality const equality_probe,
join_kind const join_type,
cudf::detail::mixed_multimap_type::device_view hash_table_view,
ast::detail::expression_device_view device_expression_data,
bool const swap_tables,
std::size_t* output_size,
cudf::device_span<cudf::size_type> matches_per_row)
CUDF_HIDDEN __launch_bounds__(block_size) __global__ void compute_mixed_join_output_size(
table_device_view left_table,
table_device_view right_table,
table_device_view probe,
table_device_view build,
row_hash const hash_probe,
row_equality const equality_probe,
join_kind const join_type,
cudf::detail::mixed_multimap_type::device_view hash_table_view,
ast::detail::expression_device_view device_expression_data,
bool const swap_tables,
std::size_t* output_size,
cudf::device_span<cudf::size_type> matches_per_row)
{
// The (required) extern storage of the shared memory array leads to
// conflicting declarations between different templates. The easiest
Expand Down

0 comments on commit aa466aa

Please sign in to comment.