From 58416070ad23c42e08ed57532402ecac84b252c6 Mon Sep 17 00:00:00 2001 From: intwanghao Date: Tue, 10 Jun 2025 16:11:35 +0800 Subject: [PATCH] fix Signed-off-by: intwanghao --- clang/lib/DPCT/RulesLang/APINamesMisc.inc | 33 +++++++++++-------- .../dpct/enable-all-experimental-features.cu | 10 +++--- clang/test/dpct/occupancy_expr.cu | 10 +++--- .../dpct/query_api_mapping/Driver/test.cu | 2 +- .../dpct/query_api_mapping/Runtime/test.cu | 2 +- 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/clang/lib/DPCT/RulesLang/APINamesMisc.inc b/clang/lib/DPCT/RulesLang/APINamesMisc.inc index 3112a9aa57ef..ab0476e6979b 100644 --- a/clang/lib/DPCT/RulesLang/APINamesMisc.inc +++ b/clang/lib/DPCT/RulesLang/APINamesMisc.inc @@ -17,9 +17,10 @@ CONDITIONAL_FACTORY_ENTRY( CALL(MapNames::getDpctNamespace() + "experimental::calculate_max_active_wg_per_xecore", ARG(0), ARG(2), - BO(BinaryOperatorKind::BO_Add, ARG(3), - ARG("dpct_placeholder /* total share local memory " - "size */"))))), + makeCombinedArg(ARG(3), + ARG(" /* + dpct_placeholder (replace " + "dpct_placeholder with static " + "share local memory size) */"))))), Diagnostics::MAX_ACTIVE_WG_ARGS, ARG(MapNames::getDpctNamespace() + "experimental::calculate_max_active_wg_per_xecore"), @@ -38,9 +39,10 @@ CONDITIONAL_FACTORY_ENTRY( CALL(MapNames::getDpctNamespace() + "experimental::calculate_max_active_wg_per_xecore", ARG(0), ARG(2), - BO(BinaryOperatorKind::BO_Add, ARG(3), - ARG("dpct_placeholder /* total share local memory " - "size */"))))), + makeCombinedArg(ARG(3), + ARG(" /* + dpct_placeholder (replace " + "dpct_placeholder with static " + "share local memory size) */"))))), Diagnostics::MAX_ACTIVE_WG_ARGS, ARG(MapNames::getDpctNamespace() + "experimental::calculate_max_active_wg_per_xecore"), @@ -59,9 +61,10 @@ CONDITIONAL_FACTORY_ENTRY( CALL(MapNames::getDpctNamespace() + "experimental::calculate_max_potential_wg", ARG(0), ARG(1), ARG(4), - BO(BinaryOperatorKind::BO_Add, ARG(3), - ARG("dpct_placeholder /* total share local memory " - "size */")))), + makeCombinedArg(ARG(3), + ARG(" /* + dpct_placeholder (replace " + "dpct_placeholder with static " + "share local memory size) */")))), CONDITIONAL_FACTORY_ENTRY( CheckArgCount(4, std::equal_to<>(), false), CALL_FACTORY_ENTRY( @@ -69,16 +72,18 @@ CONDITIONAL_FACTORY_ENTRY( CALL(MapNames::getDpctNamespace() + "experimental::calculate_max_potential_wg", ARG(0), ARG(1), ARG("0"), - BO(BinaryOperatorKind::BO_Add, ARG(3), - ARG("dpct_placeholder /* total share local memory " - "size */")))), + makeCombinedArg(ARG(3), + ARG(" /* + dpct_placeholder (replace " + "dpct_placeholder with static " + "share local memory size) */")))), CALL_FACTORY_ENTRY( "cudaOccupancyMaxPotentialBlockSize", CALL(MapNames::getDpctNamespace() + "experimental::calculate_max_potential_wg", ARG(0), ARG(1), ARG("0"), - ARG("dpct_placeholder /* total share local memory " - "size */"))))), + ARG("/* dpct_placeholder (replace dpct_placeholder " + "with static share local memory " + "size) */"))))), Diagnostics::MAX_ACTIVE_WG_ARGS, ARG(MapNames::getDpctNamespace() + "experimental::calculate_max_potential_wg"), diff --git a/clang/test/dpct/enable-all-experimental-features.cu b/clang/test/dpct/enable-all-experimental-features.cu index 2719708ed40f..1595cdb0e4ea 100644 --- a/clang/test/dpct/enable-all-experimental-features.cu +++ b/clang/test/dpct/enable-all-experimental-features.cu @@ -241,14 +241,14 @@ int occupancy() { // CHECK: /* // CHECK: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_active_wg_per_xecore" base on the target function "k". // CHECK: */ - // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxActiveBlocksPerMultiprocessor(&num_blocks, k, block_size, dynamic_shared_memory_size); CUfunction func; // CHECK: /* // CHECK: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_active_wg_per_xecore" base on the target function "func". // CHECK: */ - // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cuOccupancyMaxActiveBlocksPerMultiprocessor(&num_blocks, func, block_size, dynamic_shared_memory_size); int min_grid_size; @@ -256,17 +256,17 @@ int occupancy() { // CHECK: /* // CHECK-NEXT: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_potential_wg" base on the target function "k". // CHECK-NEXT: */ - // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, dpct_placeholder /* total share local memory size */); + // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, /* dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxPotentialBlockSize(&min_grid_size, &block_size, k); // CHECK: /* // CHECK-NEXT: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_potential_wg" base on the target function "k". // CHECK-NEXT: */ - // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxPotentialBlockSize(&min_grid_size, &block_size, k, dynamic_shared_memory_size); // CHECK: /* // CHECK-NEXT: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_potential_wg" base on the target function "k". // CHECK-NEXT: */ - // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, block_size_limit, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, block_size_limit, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxPotentialBlockSize(&min_grid_size, &block_size, k, dynamic_shared_memory_size, block_size_limit); return 0; } diff --git a/clang/test/dpct/occupancy_expr.cu b/clang/test/dpct/occupancy_expr.cu index c850d888e3b7..a7405a551631 100644 --- a/clang/test/dpct/occupancy_expr.cu +++ b/clang/test/dpct/occupancy_expr.cu @@ -10,14 +10,14 @@ int main() { // CHECK: /* // CHECK: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_active_wg_per_xecore" base on the target function "k". // CHECK: */ - // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxActiveBlocksPerMultiprocessor(&num_blocks, k, block_size, dynamic_shared_memory_size); CUfunction func; // CHECK: /* // CHECK: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_active_wg_per_xecore" base on the target function "func". // CHECK: */ - // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK: dpct::experimental::calculate_max_active_wg_per_xecore(&num_blocks, block_size, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cuOccupancyMaxActiveBlocksPerMultiprocessor(&num_blocks, func, block_size, dynamic_shared_memory_size); int min_grid_size; @@ -25,17 +25,17 @@ int main() { // CHECK: /* // CHECK-NEXT: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_potential_wg" base on the target function "k". // CHECK-NEXT: */ - // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, dpct_placeholder /* total share local memory size */); + // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, /* dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxPotentialBlockSize(&min_grid_size, &block_size, k); // CHECK: /* // CHECK-NEXT: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_potential_wg" base on the target function "k". // CHECK-NEXT: */ - // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, 0, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxPotentialBlockSize(&min_grid_size, &block_size, k, dynamic_shared_memory_size); // CHECK: /* // CHECK-NEXT: DPCT1111:{{[0-9]+}}: Please verify the input arguments of "dpct::experimental::calculate_max_potential_wg" base on the target function "k". // CHECK-NEXT: */ - // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, block_size_limit, dynamic_shared_memory_size + dpct_placeholder /* total share local memory size */); + // CHECK-NEXT:dpct::experimental::calculate_max_potential_wg(&min_grid_size, &block_size, block_size_limit, dynamic_shared_memory_size /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); cudaOccupancyMaxPotentialBlockSize(&min_grid_size, &block_size, k, dynamic_shared_memory_size, block_size_limit); return 0; } diff --git a/clang/test/dpct/query_api_mapping/Driver/test.cu b/clang/test/dpct/query_api_mapping/Driver/test.cu index ea5fb3cb3808..7f45a0983029 100644 --- a/clang/test/dpct/query_api_mapping/Driver/test.cu +++ b/clang/test/dpct/query_api_mapping/Driver/test.cu @@ -402,7 +402,7 @@ // CUOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: cuOccupancyMaxActiveBlocksPerMultiprocessor(pi /*int **/, f /*CUfunction*/, // CUOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: i /*int*/, s /*size_t*/); // CUOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: Is migrated to (with the option --use-experimental-features=occupancy-calculation): -// CUOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: dpct::experimental::calculate_max_active_wg_per_xecore(pi, i, s + dpct_placeholder /* total share local memory size */); +// CUOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: dpct::experimental::calculate_max_active_wg_per_xecore(pi, i, s /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); /// Texture Reference Management [DEPRECATED] diff --git a/clang/test/dpct/query_api_mapping/Runtime/test.cu b/clang/test/dpct/query_api_mapping/Runtime/test.cu index 35eaf29d89b8..f25d6bad31f7 100644 --- a/clang/test/dpct/query_api_mapping/Runtime/test.cu +++ b/clang/test/dpct/query_api_mapping/Runtime/test.cu @@ -360,7 +360,7 @@ // CUDAOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: cudaOccupancyMaxActiveBlocksPerMultiprocessor( // CUDAOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: pi /*int **/, pFunc /*const void **/, i /*int*/, s /*size_t*/); // CUDAOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: Is migrated to (with the option --use-experimental-features=occupancy-calculation): -// CUDAOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: dpct::experimental::calculate_max_active_wg_per_xecore(pi, i, s + dpct_placeholder /* total share local memory size */); +// CUDAOCCUPANCYMAXACTIVEBLOCKSPERMULTIPROCESSOR-NEXT: dpct::experimental::calculate_max_active_wg_per_xecore(pi, i, s /* + dpct_placeholder (replace dpct_placeholder with static share local memory size) */); /// Memory Management [DEPRECATED]