@@ -25,10 +25,11 @@ Status SuperKernel::Launch(rtStream_t stream, uint32_t dump_flag) { | |||||
const void *args[] = {this->GetNavTablePtr(), | const void *args[] = {this->GetNavTablePtr(), | ||||
reinterpret_cast<const void *>(reinterpret_cast<uintptr_t>(this->GetNavTableSize()))}; | reinterpret_cast<const void *>(reinterpret_cast<uintptr_t>(this->GetNavTableSize()))}; | ||||
rtError_t rt_ret = rtMalloc((void **)&(device_args_addr_), sizeof(args), RT_MEMORY_HBM); | |||||
rtError_t rt_ret = rtMalloc(reinterpret_cast<void **>(&(device_args_addr_)), sizeof(args), RT_MEMORY_HBM); | |||||
GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMalloc failied. error: 0x%X", rt_ret); | GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMalloc failied. error: 0x%X", rt_ret); | ||||
return RT_ERROR_TO_GE_STATUS(rt_ret);) | return RT_ERROR_TO_GE_STATUS(rt_ret);) | ||||
rt_ret = rtMemcpy((void *)device_args_addr_, sizeof(args), (void *)args, sizeof(args), RT_MEMCPY_HOST_TO_DEVICE); | |||||
rt_ret = rtMemcpy(reinterpret_cast<void *>(device_args_addr_), sizeof(args), | |||||
reinterpret_cast<void *>(args), sizeof(args), RT_MEMCPY_HOST_TO_DEVICE); | |||||
GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMemcpy failied. error: 0x%X", rt_ret); | GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMemcpy failied. error: 0x%X", rt_ret); | ||||
return RT_ERROR_TO_GE_STATUS(rt_ret);) | return RT_ERROR_TO_GE_STATUS(rt_ret);) | ||||
rt_ret = rtKernelLaunchWithFlag((void *const)func_stub_, block_dim_, device_args_addr_, sizeof(args), NULL, stream, | rt_ret = rtKernelLaunchWithFlag((void *const)func_stub_, block_dim_, device_args_addr_, sizeof(args), NULL, stream, | ||||
@@ -104,11 +104,12 @@ Status SuperKernelFactory::FuseKernels(const std::vector<void *> &stub_func_list | |||||
nav_table[i * 2 + 1] = reinterpret_cast<uint64_t>(reinterpret_cast<uintptr_t>(args_addr_list[i])); | nav_table[i * 2 + 1] = reinterpret_cast<uint64_t>(reinterpret_cast<uintptr_t>(args_addr_list[i])); | ||||
GELOGD("SKT: fuseKernels args base address %lu", nav_table[i * 2 + 1]); | GELOGD("SKT: fuseKernels args base address %lu", nav_table[i * 2 + 1]); | ||||
} | } | ||||
rt_ret = rtMalloc((void **)&hbm_nav_table_addr, nav_table_size, RT_MEMORY_HBM); | |||||
rt_ret = rtMalloc(reinterpret_cast<void **>(hbm_nav_table_addr), nav_table_size, RT_MEMORY_HBM); | |||||
GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMalloc failed. error: 0x%X", rt_ret); | GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMalloc failed. error: 0x%X", rt_ret); | ||||
return RT_ERROR_TO_GE_STATUS(rt_ret);) | return RT_ERROR_TO_GE_STATUS(rt_ret);) | ||||
rt_ret = | rt_ret = | ||||
rtMemcpy((void *)hbm_nav_table_addr, nav_table_size, (void *)nav_table, nav_table_size, RT_MEMCPY_HOST_TO_DEVICE); | |||||
rtMemcpy(reinterpret_cast<void *>(hbm_nav_table_addr), nav_table_size, | |||||
reinterpret_cast<void *>(nav_table), nav_table_size, RT_MEMCPY_HOST_TO_DEVICE); | |||||
GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMemcpy failed. error: 0x%X", rt_ret); | GE_IF_BOOL_EXEC(rt_ret != RT_ERROR_NONE, GELOGE(RT_FAILED, "rtMemcpy failed. error: 0x%X", rt_ret); | ||||
GE_CHK_RT(rtFree(hbm_nav_table_addr)); return RT_ERROR_TO_GE_STATUS(rt_ret);) | GE_CHK_RT(rtFree(hbm_nav_table_addr)); return RT_ERROR_TO_GE_STATUS(rt_ret);) | ||||
// Create the necessary metadata for the super kernel | // Create the necessary metadata for the super kernel | ||||
@@ -130,7 +130,7 @@ Status ZeroCopyTask::UpdateTaskParam(uintptr_t addr, void *buffer_addr, const ma | |||||
auto dst_addr = static_cast<uint8_t *>(buffer_addr); | auto dst_addr = static_cast<uint8_t *>(buffer_addr); | ||||
GELOGI("[ZCPY] %s update task, args_addr: %p, size: %zu, offset: %zu, virtual_addr: 0x%lx, user_data_addr: %p", | GELOGI("[ZCPY] %s update task, args_addr: %p, size: %zu, offset: %zu, virtual_addr: 0x%lx, user_data_addr: %p", | ||||
name_.c_str(), args_addr_, args_size_, offset, addr, buffer_addr); | name_.c_str(), args_addr_, args_size_, offset, addr, buffer_addr); | ||||
*(uintptr_t *)(args_info + offset) = reinterpret_cast<uintptr_t>(dst_addr); | |||||
*reinterpret_cast<uintptr_t *>(args_info + offset) = reinterpret_cast<uintptr_t>(dst_addr); | |||||
is_updated_ = true; | is_updated_ = true; | ||||
} | } | ||||
} | } | ||||
@@ -891,7 +891,7 @@ FMK_FUNC_HOST_VISIBILITY Status ConvertOmModelToJson(const char *model_file, con | |||||
if (status != ge::GRAPH_SUCCESS) { | if (status != ge::GRAPH_SUCCESS) { | ||||
GELOGE(ge::FAILED, "Om file init failed."); | GELOGE(ge::FAILED, "Om file init failed."); | ||||
if (model.model_data != nullptr) { | if (model.model_data != nullptr) { | ||||
delete[](char *) model.model_data; | |||||
delete[]reinterpret_cast<char *>(model.model_data); | |||||
model.model_data = nullptr; | model.model_data = nullptr; | ||||
} | } | ||||
return status; | return status; | ||||
@@ -902,7 +902,7 @@ FMK_FUNC_HOST_VISIBILITY Status ConvertOmModelToJson(const char *model_file, con | |||||
if (status != ge::GRAPH_SUCCESS) { | if (status != ge::GRAPH_SUCCESS) { | ||||
GELOGE(ge::FAILED, "Get model part failed."); | GELOGE(ge::FAILED, "Get model part failed."); | ||||
if (model.model_data != nullptr) { | if (model.model_data != nullptr) { | ||||
delete[](char *) model.model_data; | |||||
delete[]reinterpret_cast<char *>(model.model_data); | |||||
model.model_data = nullptr; | model.model_data = nullptr; | ||||
} | } | ||||
return status; | return status; | ||||
@@ -928,7 +928,7 @@ FMK_FUNC_HOST_VISIBILITY Status ConvertOmModelToJson(const char *model_file, con | |||||
} | } | ||||
if (model.model_data != nullptr) { | if (model.model_data != nullptr) { | ||||
delete[](char *) model.model_data; | |||||
delete[]reinterpret_cast<char *>(model.model_data); | |||||
model.model_data = nullptr; | model.model_data = nullptr; | ||||
} | } | ||||
@@ -24,9 +24,9 @@ | |||||
#include "graph/ge_error_codes.h" | #include "graph/ge_error_codes.h" | ||||
namespace { | namespace { | ||||
#define IR_MAJOR_VERSION (int(1)) | |||||
#define IR_MINOR_VERSION (int(0)) | |||||
#define IR_PATCH_VERSION (int(0)) | |||||
#define IR_MAJOR_VERSION (static_cast<int>(1)) | |||||
#define IR_MINOR_VERSION (static_cast<int>(0)) | |||||
#define IR_PATCH_VERSION (static_cast<int>(0)) | |||||
} // namespace | } // namespace | ||||
namespace ge { | namespace ge { | ||||