Closed
feat(aicpu): add constant folding host registration #10680
wby50065566Add on Aug 26Closed at 1 day ago
feat(aicpu): add constant folding host registration #10680
Closed
Total: 2 files changed+57-2
| @@ -21,7 +21,7 @@ endfunction() | |||
| 21 | 21 | ||
| 22 | # 用于custom自定算子包host侧obj生成 | 22 | # 用于custom自定算子包host侧obj生成 |
| 23 | macro(add_modules_sources) | 23 | macro(add_modules_sources) |
| 24 | - set(oneValueArgs OP_API_INDEPENDENT OP_API_DIR OP_MC2_ENABLE) | 24 | + set(oneValueArgs OP_API_INDEPENDENT OP_API_DIR OP_MC2_ENABLE HOSTCPU) |
| 25 | set(multiValueArgs OPTYPE ACLNNTYPE ACLNN_EXTRA_VERSION) | 25 | set(multiValueArgs OPTYPE ACLNNTYPE ACLNN_EXTRA_VERSION) |
| 26 | 26 | ||
| 27 | cmake_parse_arguments(MODULE "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) | 27 | cmake_parse_arguments(MODULE "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) |
| @@ -148,6 +148,17 @@ macro(add_modules_sources) | |||
| 148 | endif() | 148 | endif() |
| 149 | endif() | 149 | endif() |
| 150 | 150 | ||
| 151 | + if(MODULE_HOSTCPU AND BUILD_WITH_INSTALLED_DEPENDENCY_CANN_PKG AND ENABLE_BUILT_IN) | ||
| 152 | + get_filename_component(_OP_ROOT ${SOURCE_DIR} DIRECTORY) | ||
| 153 | + get_filename_component(_OP_NAME ${_OP_ROOT} NAME) | ||
| 154 | + file(GLOB AICPU_HOST_SRCS ${_OP_ROOT}/op_kernel_aicpu/*_aicpu.cpp) | ||
| 155 | + if(AICPU_HOST_SRCS) | ||
| 156 | + set(HOST_OBJ_NAME ${_OP_NAME}_host_const_obj) | ||
| 157 | + add_aicpu_host_kernel_modules(${HOST_OBJ_NAME}) | ||
| 158 | + target_sources(${HOST_OBJ_NAME} PRIVATE ${AICPU_HOST_SRCS}) | ||
| 159 | + endif() | ||
| 160 | + endif() | ||
| 161 | + | ||
| 151 | if (MODULE_OPTYPE) | 162 | if (MODULE_OPTYPE) |
| 152 | list(LENGTH MODULE_OPTYPE OpTypeLen) | 163 | list(LENGTH MODULE_OPTYPE OpTypeLen) |
| 153 | list(LENGTH MODULE_ACLNNTYPE AclnnTypeLen) | 164 | list(LENGTH MODULE_ACLNNTYPE AclnnTypeLen) |
| @@ -186,7 +197,7 @@ macro(add_modules_sources) | |||
| 186 | endmacro() | 197 | endmacro() |
| 187 | 198 | ||
| 188 | macro(add_modules_sources_with_soc) | 199 | macro(add_modules_sources_with_soc) |
| 189 | - set(oneValueArgs OP_API_INDEPENDENT OP_API_DIR OP_MC2_ENABLE) | 200 | + set(oneValueArgs OP_API_INDEPENDENT OP_API_DIR OP_MC2_ENABLE HOSTCPU) |
| 190 | set(multiValueArgs OPTYPE ACLNNTYPE) | 201 | set(multiValueArgs OPTYPE ACLNNTYPE) |
| 191 | 202 | ||
| 192 | cmake_parse_arguments(MODULE "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) | 203 | cmake_parse_arguments(MODULE "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) |
| @@ -343,6 +354,16 @@ macro(add_modules_sources_with_soc) | |||
| 343 | target_sources(${OPHOST_NAME}_aicpu_obj PRIVATE ${AICPU_SRCS}) | 354 | target_sources(${OPHOST_NAME}_aicpu_obj PRIVATE ${AICPU_SRCS}) |
| 344 | endif() | 355 | endif() |
| 345 | 356 | ||
| 357 | + if(MODULE_HOSTCPU AND BUILD_WITH_INSTALLED_DEPENDENCY_CANN_PKG AND ENABLE_BUILT_IN) | ||
| 358 | + get_filename_component(_OP_ROOT ${SOURCE_DIR} DIRECTORY) | ||
| 359 | + file(GLOB AICPU_HOST_SRCS ${_OP_ROOT}/op_kernel_aicpu/*_aicpu.cpp) | ||
| 360 | + if(AICPU_HOST_SRCS) | ||
| 361 | + set(HOST_OBJ_NAME ${OPS_NAME}_host_const_obj) | ||
| 362 | + add_aicpu_host_kernel_modules(${HOST_OBJ_NAME}) | ||
| 363 | + target_sources(${HOST_OBJ_NAME} PRIVATE ${AICPU_HOST_SRCS}) | ||
| 364 | + endif() | ||
| 365 | + endif() | ||
| 366 | + | ||
| 346 | if (MODULE_OPTYPE) | 367 | if (MODULE_OPTYPE) |
| 347 | list(LENGTH MODULE_OPTYPE OpTypeLen) | 368 | list(LENGTH MODULE_OPTYPE OpTypeLen) |
| 348 | list(LENGTH MODULE_ACLNNTYPE AclnnTypeLen) | 369 | list(LENGTH MODULE_ACLNNTYPE AclnnTypeLen) |
| @@ -949,6 +970,7 @@ function(add_aicpu_host_kernel_modules host_target_name) | |||
| 949 | ${host_target_name} PRIVATE | 970 | ${host_target_name} PRIVATE |
| 950 | _FORTIFY_SOURCE=2 | 971 | _FORTIFY_SOURCE=2 |
| 951 | google=ascend_private | 972 | google=ascend_private |
| 973 | + OPS_TRANSFORMER_AICPU_HOST_KERNEL | ||
| 952 | ) | 974 | ) |
| 953 | target_compile_options( | 975 | target_compile_options( |
| 954 | ${host_target_name} PRIVATE | 976 | ${host_target_name} PRIVATE |
| @@ -0,0 +1,33 @@ | |||
| 1 | +/** | ||
| 2 | + * Copyright (c) 2026 Huawei Technologies Co., Ltd. | ||
| 3 | + * This program is free software, you can redistribute it and/or modify it under the terms and conditions of | ||
| 4 | + * CANN Open Software License Agreement Version 2.0 (the "License"). | ||
| 5 | + * Please refer to the License for details. You may not use this file except in compliance with the License. | ||
| 6 | + * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, | ||
| 7 | + * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. | ||
| 8 | + * See LICENSE in the root of the software repository for the full text of the License. | ||
| 9 | + */ | ||
| 10 | + | ||
| 11 | +#ifndef OPS_TRANSFORMER_COMMON_OP_KERNEL_TRANSFORMER_AICPU_REGISTER_H | ||
| 12 | +#define OPS_TRANSFORMER_COMMON_OP_KERNEL_TRANSFORMER_AICPU_REGISTER_H | ||
| 13 | + | ||
| 14 | +#include "cpu_kernel.h" | ||
| 15 | + | ||
| 16 | +namespace aicpu { | ||
| 17 | +__attribute__((weak)) bool RegistCpuKernelV2(const std::string &type, const KERNEL_CREATOR_FUN &fun); | ||
| 18 | +} // namespace aicpu | ||
| 19 | + | ||
| 20 | +#if defined(OPS_TRANSFORMER_AICPU_HOST_KERNEL) | ||
| 21 | +#define OPS_TRANSFORMER_REGISTER_CPU_KERNELV2(type, clazz) \ | ||
| 22 | + static std::shared_ptr<aicpu::CpuKernel> Creator_##type##_Kernel() \ | ||
| 23 | + { \ | ||
| 24 | + return aicpu::MakeShared<clazz>(); \ | ||
| 25 | + } \ | ||
| 26 | + static bool g_##type##_Kernel_Creator __attribute__((unused)) = \ | ||
| 27 | + ((&::aicpu::RegistCpuKernelV2) != nullptr) ? ::aicpu::RegistCpuKernelV2((type), Creator_##type##_Kernel) : \ | ||
| 28 | + ::aicpu::RegistCpuKernel((type), Creator_##type##_Kernel) | ||
| 29 | +#else | ||
| 30 | +#define OPS_TRANSFORMER_REGISTER_CPU_KERNELV2(type, clazz) REGISTER_CPU_KERNEL(type, clazz) | ||
| 31 | +#endif | ||
| 32 | + | ||
| 33 | +#endif // OPS_TRANSFORMER_COMMON_OP_KERNEL_TRANSFORMER_AICPU_REGISTER_H | ||