已合并
【PR】: 替换runtime/*.h #3711
wuqianqian24创建于 6月25日
【PR】: 替换runtime/*.h #3711
已合并
共 6 个文件变更+49-273
| @@ -15,8 +15,9 @@ | |||
| 15 | #include "securec.h" | 15 | #include "securec.h" |
| 16 | #include "mmpa/mmpa_api.h" | 16 | #include "mmpa/mmpa_api.h" |
| 17 | #include "runtime_stub.h" | 17 | #include "runtime_stub.h" |
| 18 | -#include "runtime/rt.h" | 18 | +#include "rt_external.h" |
| 19 | -#include "runtime/rt_preload_task.h" | 19 | +#include "acl/acl_rt.h" |
| 20 | +#include "rt_external_preload.h" | ||
| 20 | 21 | ||
| 21 | extern std::string g_runtime_stub_mock; | 22 | extern std::string g_runtime_stub_mock; |
| 22 | std::string g_runtime_stub_mock = ""; | 23 | std::string g_runtime_stub_mock = ""; |
| @@ -261,8 +262,11 @@ rtError_t rtGetDevice(int32_t *device) { | |||
| 261 | ADD_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t); | 262 | ADD_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t); |
| 262 | ADD_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value); | 263 | ADD_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value); |
| 263 | rtError_t rtGetDeviceCapability(int32_t device, int32_t moduleType, int32_t featureType, int32_t *value) { | 264 | rtError_t rtGetDeviceCapability(int32_t device, int32_t moduleType, int32_t featureType, int32_t *value) { |
| 264 | - *value = GET_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value, RT_AICPU_BLOCKING_OP_SUPPORT); | 265 | + (void)device; |
| 265 | - return GET_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t, RT_ERROR_NONE); | 266 | + (void)moduleType; |
| 267 | + (void)featureType; | ||
| 268 | + *value = 16; | ||
| 269 | + return RT_ERROR_NONE; | ||
| 266 | } | 270 | } |
| 267 | 271 | ||
| 268 | ADD_STUB_RETURN_VALUE(rtStreamWaitEvent, rtError_t); | 272 | ADD_STUB_RETURN_VALUE(rtStreamWaitEvent, rtError_t); |
| @@ -298,17 +302,6 @@ rtError_t rtQueryFunctionRegistered(const char *stub_name) { | |||
| 298 | return GET_STUB_RETURN_VALUE(rtQueryFunctionRegistered, rtError_t, RT_ERROR_NONE); | 302 | return GET_STUB_RETURN_VALUE(rtQueryFunctionRegistered, rtError_t, RT_ERROR_NONE); |
| 299 | } | 303 | } |
| 300 | 304 | ||
| 301 | -rtError_t rtCtxSetCurrent(rtContext_t ctx) { | ||
| 302 | - const char *const kEnvRecordPath = "SET_TRANS_VAR_DATA"; | ||
| 303 | - char record_path[MMPA_MAX_PATH] = {}; | ||
| 304 | - (void)mmGetEnv(kEnvRecordPath, &record_path[0], static_cast<uint32_t>(MMPA_MAX_PATH)); | ||
| 305 | - | ||
| 306 | - if (std::string(&record_path[0]).find("mock_fail") != std::string::npos) { | ||
| 307 | - return -1; | ||
| 308 | - } | ||
| 309 | - return RT_ERROR_NONE; | ||
| 310 | -} | ||
| 311 | - | ||
| 312 | rtError_t rtGetAvailEventNum(uint32_t *const eventCount) { | 305 | rtError_t rtGetAvailEventNum(uint32_t *const eventCount) { |
| 313 | if (eventCount != nullptr) { | 306 | if (eventCount != nullptr) { |
| 314 | *eventCount = 2048; | 307 | *eventCount = 2048; |
| @@ -321,19 +314,6 @@ rtError_t rtGetStreamId(rtStream_t stream, int32_t *stream_id) { | |||
| 321 | return RT_ERROR_NONE; | 314 | return RT_ERROR_NONE; |
| 322 | } | 315 | } |
| 323 | 316 | ||
| 324 | -rtError_t rtCtxGetCurrent(rtContext_t *ctx) { | ||
| 325 | - if (__FUNCTION__ == g_runtime_stub_mock) { | ||
| 326 | - return -1; | ||
| 327 | - } | ||
| 328 | - uintptr_t x = 1; | ||
| 329 | - *ctx = (rtContext_t *)x; | ||
| 330 | - return RT_ERROR_NONE; | ||
| 331 | -} | ||
| 332 | - | ||
| 333 | -rtError_t rtCtxSetDryRun(rtContext_t ctx, rtDryRunFlag_t enable, uint32_t flag) { | ||
| 334 | - return RT_ERROR_NONE; | ||
| 335 | -} | ||
| 336 | - | ||
| 337 | rtError_t rtEventGetTimeStamp(uint64_t *time, rtEvent_t event) { | 317 | rtError_t rtEventGetTimeStamp(uint64_t *time, rtEvent_t event) { |
| 338 | *time = 12345; | 318 | *time = 12345; |
| 339 | return RT_ERROR_NONE; | 319 | return RT_ERROR_NONE; |
| @@ -507,10 +487,6 @@ rtError_t rtKernelLaunchWithFlagV2(const void *stubFunc, uint32_t blockDim, rtAr | |||
| 507 | return ge::RuntimeStub::GetInstance()->rtKernelLaunchWithFlagV2(stubFunc, blockDim, argsInfo, smDesc, stm, flags, | 487 | return ge::RuntimeStub::GetInstance()->rtKernelLaunchWithFlagV2(stubFunc, blockDim, argsInfo, smDesc, stm, flags, |
| 508 | cfgInfo); | 488 | cfgInfo); |
| 509 | } | 489 | } |
| 510 | -rtError_t rtKernelGetAddrAndPrefCntV2(void *handle, const uint64_t tilingKey, const void *const stubFunc, | ||
| 511 | - const uint32_t flag, rtKernelDetailInfo_t *kernelInfo) { | ||
| 512 | - return ge::RuntimeStub::GetInstance()->rtKernelGetAddrAndPrefCntV2(handle, tilingKey, stubFunc, flag, kernelInfo); | ||
| 513 | -} | ||
| 514 | rtError_t rtSetupArgument(const void *arg, uint32_t size, uint32_t offset) { | 490 | rtError_t rtSetupArgument(const void *arg, uint32_t size, uint32_t offset) { |
| 515 | return RT_ERROR_NONE; | 491 | return RT_ERROR_NONE; |
| 516 | } | 492 | } |
| @@ -528,10 +504,6 @@ rtError_t rtSetProfDir(char *prof_dir) { | |||
| 528 | return RT_ERROR_NONE; | 504 | return RT_ERROR_NONE; |
| 529 | } | 505 | } |
| 530 | 506 | ||
| 531 | -rtError_t rtAiCoreMemorySizes(rtAiCoreMemorySize_t *aicore_memory_size) { | ||
| 532 | - return RT_ERROR_NONE; | ||
| 533 | -} | ||
| 534 | - | ||
| 535 | rtError_t rtMemAdvise(void *ptr, uint64_t size, uint32_t advise) { | 507 | rtError_t rtMemAdvise(void *ptr, uint64_t size, uint32_t advise) { |
| 536 | return RT_ERROR_NONE; | 508 | return RT_ERROR_NONE; |
| 537 | } | 509 | } |
| @@ -557,12 +529,6 @@ rtError_t rtMemGetInfo(size_t *free, size_t *total) { | |||
| 557 | return RT_ERROR_NONE; | 529 | return RT_ERROR_NONE; |
| 558 | } | 530 | } |
| 559 | 531 | ||
| 560 | -rtError_t rtMemGetInfoEx(rtMemInfoType_t memInfoType, size_t *free, size_t *total) { | ||
| 561 | - *free = 16UL * 1024UL * 1024UL * 1024UL; | ||
| 562 | - *total = 32UL * 1024UL * 1024UL * 1024UL; | ||
| 563 | - return RT_ERROR_NONE; | ||
| 564 | -} | ||
| 565 | - | ||
| 566 | rtError_t rtMemAllocManaged(void **ptr, uint64_t size, uint32_t flag, const uint16_t moduleId) { | 532 | rtError_t rtMemAllocManaged(void **ptr, uint64_t size, uint32_t flag, const uint16_t moduleId) { |
| 567 | *ptr = malloc(size); | 533 | *ptr = malloc(size); |
| 568 | return RT_ERROR_NONE; | 534 | return RT_ERROR_NONE; |
| @@ -579,9 +545,6 @@ rtError_t rtMetadataRegister(void *handle, const char *meta_data) { | |||
| 579 | } | 545 | } |
| 580 | return RT_ERROR_NONE; | 546 | return RT_ERROR_NONE; |
| 581 | } | 547 | } |
| 582 | -rtError_t rtSetTaskGenCallback(rtTaskGenCallback callback) { | ||
| 583 | - return RT_ERROR_NONE; | ||
| 584 | -} | ||
| 585 | 548 | ||
| 586 | rtError_t rtGetDeviceInfo(uint32_t device_id, int32_t module_type, int32_t info_type, int64_t *val) { | 549 | rtError_t rtGetDeviceInfo(uint32_t device_id, int32_t module_type, int32_t info_type, int64_t *val) { |
| 587 | *val = 8; | 550 | *val = 8; |
| @@ -596,10 +559,6 @@ rtError_t rtGetAddrByFun(const void *stubFunc, void **addr) { | |||
| 596 | return RT_ERROR_NONE; | 559 | return RT_ERROR_NONE; |
| 597 | } | 560 | } |
| 598 | 561 | ||
| 599 | -rtError_t rtCtxCreate(rtContext_t *ctx, uint32_t flags, int32_t device) { | ||
| 600 | - return RT_ERROR_NONE; | ||
| 601 | -} | ||
| 602 | - | ||
| 603 | rtError_t rtKernelLaunchEx(void *args, uint32_t args_size, uint32_t flags, rtStream_t stream_) { | 562 | rtError_t rtKernelLaunchEx(void *args, uint32_t args_size, uint32_t flags, rtStream_t stream_) { |
| 604 | const char *const kEnvRecordPath = "CONSTANT_FOLDING_PASS_6"; | 563 | const char *const kEnvRecordPath = "CONSTANT_FOLDING_PASS_6"; |
| 605 | char record_path[MMPA_MAX_PATH] = {}; | 564 | char record_path[MMPA_MAX_PATH] = {}; |
| @@ -633,10 +592,6 @@ rtError_t rtProfilerStop(uint64_t profConfig, int32_t numsDev, uint32_t *deviceL | |||
| 633 | return RT_ERROR_NONE; | 592 | return RT_ERROR_NONE; |
| 634 | } | 593 | } |
| 635 | 594 | ||
| 636 | -rtError_t rtCtxDestroy(rtContext_t ctx) { | ||
| 637 | - return RT_ERROR_NONE; | ||
| 638 | -} | ||
| 639 | - | ||
| 640 | rtError_t rtProfilerStart(uint64_t profConfig, int32_t numsDev, uint32_t *deviceList) { | 595 | rtError_t rtProfilerStart(uint64_t profConfig, int32_t numsDev, uint32_t *deviceList) { |
| 641 | return RT_ERROR_NONE; | 596 | return RT_ERROR_NONE; |
| 642 | } | 597 | } |
| @@ -749,25 +704,6 @@ rtError_t rtSetTaskFailCallback(rtTaskFailCallback callback) { | |||
| 749 | return RT_ERROR_NONE; | 704 | return RT_ERROR_NONE; |
| 750 | } | 705 | } |
| 751 | 706 | ||
| 752 | -rtError_t rtMallocHostSharedMemory(rtMallocHostSharedMemoryIn *in, rtMallocHostSharedMemoryOut *out) { | ||
| 753 | - out->ptr = new uint8_t[in->size]; | ||
| 754 | - out->devPtr = new uint8_t[in->size]; | ||
| 755 | - return RT_ERROR_NONE; | ||
| 756 | -} | ||
| 757 | - | ||
| 758 | -rtError_t rtFreeHostSharedMemory(rtFreeHostSharedMemoryIn *in) { | ||
| 759 | - delete[] (uint8_t *)in->ptr; | ||
| 760 | - delete[] (uint8_t *)in->devPtr; | ||
| 761 | - return RT_ERROR_NONE; | ||
| 762 | -} | ||
| 763 | - | ||
| 764 | -ADD_STUB_RETURN_VALUE(rtGetAicpuDeploy, rtError_t); | ||
| 765 | -ADD_STUB_OUTBOUND_VALUE(rtGetAicpuDeploy, rtAicpuDeployType_t, value); | ||
| 766 | -rtError_t rtGetAicpuDeploy(rtAicpuDeployType_t *deplyType) { | ||
| 767 | - *deplyType = GET_STUB_OUTBOUND_VALUE(rtGetAicpuDeploy, rtAicpuDeployType_t, value, AICPU_DEPLOY_CROSS_PROCESS); | ||
| 768 | - return GET_STUB_RETURN_VALUE(rtGetAicpuDeploy, rtError_t, RT_ERROR_NONE); | ||
| 769 | -} | ||
| 770 | - | ||
| 771 | rtError_t rtSetCtxINFMode(bool mode) { | 707 | rtError_t rtSetCtxINFMode(bool mode) { |
| 772 | return RT_ERROR_NONE; | 708 | return RT_ERROR_NONE; |
| 773 | } | 709 | } |
| @@ -784,6 +720,12 @@ rtError_t rtGetRtCapability(rtFeatureType_t featureType, int32_t featureInfo, in | |||
| 784 | return RT_ERROR_NONE; | 720 | return RT_ERROR_NONE; |
| 785 | } | 721 | } |
| 786 | 722 | ||
| 723 | +typedef enum tagRtMemRequestFeature { | ||
| 724 | + MEM_REQUEST_FEATURE_DEFAULT = 0, | ||
| 725 | + MEM_REQUEST_FEATURE_OPP, | ||
| 726 | + MEM_REQUEST_FEATURE_RESERVED | ||
| 727 | +} rtMemRequestFeature_t; | ||
| 728 | + | ||
| 787 | uint32_t rtGetTsMemType(rtMemRequestFeature_t featureType, uint32_t memSize) { | 729 | uint32_t rtGetTsMemType(rtMemRequestFeature_t featureType, uint32_t memSize) { |
| 788 | return RT_MEMORY_HBM; | 730 | return RT_MEMORY_HBM; |
| 789 | } | 731 | } |
| @@ -810,10 +752,6 @@ rtError_t rtDebugUnRegisterForStream(rtStream_t stream) { | |||
| 810 | return RT_ERROR_NONE; | 752 | return RT_ERROR_NONE; |
| 811 | } | 753 | } |
| 812 | 754 | ||
| 813 | -rtError_t rtFftsTaskLaunch(rtFftsTaskInfo_t *fftsTaskInfo, rtStream_t stream) { | ||
| 814 | - return RT_ERROR_NONE; | ||
| 815 | -} | ||
| 816 | - | ||
| 817 | rtError_t rtKernelGetAddrAndPrefCnt(void *handle, const uint64_t tilingKey, const void *const stubFunc, | 755 | rtError_t rtKernelGetAddrAndPrefCnt(void *handle, const uint64_t tilingKey, const void *const stubFunc, |
| 818 | const uint32_t flag, void **addr, uint32_t *prefetchCnt) { | 756 | const uint32_t flag, void **addr, uint32_t *prefetchCnt) { |
| 819 | return RT_ERROR_NONE; | 757 | return RT_ERROR_NONE; |
| @@ -846,10 +784,6 @@ rtError_t rtProfRegisterCtrlCallback(uint32_t logId, rtProfCtrlHandle callback) | |||
| 846 | return RT_ERROR_NONE; | 784 | return RT_ERROR_NONE; |
| 847 | } | 785 | } |
| 848 | 786 | ||
| 849 | -rtError_t rtFftsTaskLaunchWithFlag(rtFftsTaskInfo_t *fftsTaskInfo, rtStream_t stream, uint32_t flag) { | ||
| 850 | - return RT_ERROR_NONE; | ||
| 851 | -} | ||
| 852 | - | ||
| 853 | rtError_t rtGetC2cCtrlAddr(uint64_t *addr, uint32_t *len) { | 787 | rtError_t rtGetC2cCtrlAddr(uint64_t *addr, uint32_t *len) { |
| 854 | return RT_ERROR_NONE; | 788 | return RT_ERROR_NONE; |
| 855 | } | 789 | } |
| @@ -12,7 +12,8 @@ | |||
| 12 | #define __INC_LLT_RUNTIME_STUB_H | 12 | #define __INC_LLT_RUNTIME_STUB_H |
| 13 | 13 | ||
| 14 | #include <vector> | 14 | #include <vector> |
| 15 | -#include "runtime/rt.h" | 15 | +#include "rt_external.h" |
| 16 | +#include "acl/acl_rt.h" | ||
| 16 | #include <memory> | 17 | #include <memory> |
| 17 | 18 | ||
| 18 | namespace ge { | 19 | namespace ge { |
| @@ -50,13 +51,6 @@ class RuntimeStub { | |||
| 50 | const rtTaskCfgInfo_t *cfgInfo) { | 51 | const rtTaskCfgInfo_t *cfgInfo) { |
| 51 | return RT_ERROR_NONE; | 52 | return RT_ERROR_NONE; |
| 52 | } | 53 | } |
| 53 | - virtual rtError_t rtKernelGetAddrAndPrefCntV2(void *handle, const uint64_t tilingKey, const void *const stubFunc, | ||
| 54 | - const uint32_t flag, rtKernelDetailInfo_t *kernelInfo) { | ||
| 55 | - kernelInfo->functionInfoNum = 1; | ||
| 56 | - kernelInfo->functionInfo[0].pcAddr = (void *)(0x1245); | ||
| 57 | - kernelInfo->functionInfo[0].prefetchCnt = 1; | ||
| 58 | - return RT_ERROR_NONE; | ||
| 59 | - } | ||
| 60 | virtual rtError_t rtCpuKernelLaunchWithFlag(const void *soName, const void *kernelName, uint32_t blockDim, | 54 | virtual rtError_t rtCpuKernelLaunchWithFlag(const void *soName, const void *kernelName, uint32_t blockDim, |
| 61 | const rtArgsEx_t *args, rtSmDesc_t *smDesc, rtStream_t stream, | 55 | const rtArgsEx_t *args, rtSmDesc_t *smDesc, rtStream_t stream, |
| 62 | uint32_t flags) { | 56 | uint32_t flags) { |
| @@ -186,9 +180,6 @@ RTS_STUB_OUTBOUND_EXTERN(rtEventCreate, uint32_t, event_id); | |||
| 186 | 180 | ||
| 187 | RTS_STUB_RETURN_EXTERN(rtQueryFunctionRegistered, rtError_t); | 181 | RTS_STUB_RETURN_EXTERN(rtQueryFunctionRegistered, rtError_t); |
| 188 | 182 | ||
| 189 | -RTS_STUB_RETURN_EXTERN(rtGetAicpuDeploy, rtError_t); | ||
| 190 | -RTS_STUB_OUTBOUND_EXTERN(rtGetAicpuDeploy, rtAicpuDeployType_t, value); | ||
| 191 | - | ||
| 192 | RTS_STUB_RETURN_EXTERN(rtProfilerTraceEx, rtError_t); | 183 | RTS_STUB_RETURN_EXTERN(rtProfilerTraceEx, rtError_t); |
| 193 | 184 | ||
| 194 | RTS_STUB_RETURN_EXTERN(rtNpuGetFloatStatus, rtError_t); | 185 | RTS_STUB_RETURN_EXTERN(rtNpuGetFloatStatus, rtError_t); |
| @@ -15,9 +15,9 @@ | |||
| 15 | #include "securec.h" | 15 | #include "securec.h" |
| 16 | #include "mmpa/mmpa_api.h" | 16 | #include "mmpa/mmpa_api.h" |
| 17 | #include "runtime_stub.h" | 17 | #include "runtime_stub.h" |
| 18 | -#include "runtime/rt.h" | 18 | +#include "rt_external.h" |
| 19 | -#include "runtime/rt_preload_task.h" | ||
| 20 | #include "acl/acl_rt.h" | 19 | #include "acl/acl_rt.h" |
| 20 | +#include "rt_external_preload.h" | ||
| 21 | 21 | ||
| 22 | extern std::string g_runtime_stub_mock; | 22 | extern std::string g_runtime_stub_mock; |
| 23 | std::string g_runtime_stub_mock = ""; | 23 | std::string g_runtime_stub_mock = ""; |
| @@ -262,8 +262,11 @@ rtError_t rtGetDevice(int32_t *device) { | |||
| 262 | ADD_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t); | 262 | ADD_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t); |
| 263 | ADD_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value); | 263 | ADD_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value); |
| 264 | rtError_t rtGetDeviceCapability(int32_t device, int32_t moduleType, int32_t featureType, int32_t *value) { | 264 | rtError_t rtGetDeviceCapability(int32_t device, int32_t moduleType, int32_t featureType, int32_t *value) { |
| 265 | - *value = GET_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value, RT_AICPU_BLOCKING_OP_SUPPORT); | 265 | + (void)device; |
| 266 | - return GET_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t, RT_ERROR_NONE); | 266 | + (void)moduleType; |
| 267 | + (void)featureType; | ||
| 268 | + *value = 16; | ||
| 269 | + return RT_ERROR_NONE; | ||
| 267 | } | 270 | } |
| 268 | 271 | ||
| 269 | ADD_STUB_RETURN_VALUE(rtStreamWaitEvent, rtError_t); | 272 | ADD_STUB_RETURN_VALUE(rtStreamWaitEvent, rtError_t); |
| @@ -299,17 +302,6 @@ rtError_t rtQueryFunctionRegistered(const char *stub_name) { | |||
| 299 | return GET_STUB_RETURN_VALUE(rtQueryFunctionRegistered, rtError_t, RT_ERROR_NONE); | 302 | return GET_STUB_RETURN_VALUE(rtQueryFunctionRegistered, rtError_t, RT_ERROR_NONE); |
| 300 | } | 303 | } |
| 301 | 304 | ||
| 302 | -rtError_t rtCtxSetCurrent(rtContext_t ctx) { | ||
| 303 | - const char *const kEnvRecordPath = "SET_TRANS_VAR_DATA"; | ||
| 304 | - char record_path[MMPA_MAX_PATH] = {}; | ||
| 305 | - (void)mmGetEnv(kEnvRecordPath, &record_path[0], static_cast<uint32_t>(MMPA_MAX_PATH)); | ||
| 306 | - | ||
| 307 | - if (std::string(&record_path[0]).find("mock_fail") != std::string::npos) { | ||
| 308 | - return -1; | ||
| 309 | - } | ||
| 310 | - return RT_ERROR_NONE; | ||
| 311 | -} | ||
| 312 | - | ||
| 313 | rtError_t rtGetAvailEventNum(uint32_t *const eventCount) { | 305 | rtError_t rtGetAvailEventNum(uint32_t *const eventCount) { |
| 314 | if (eventCount != nullptr) { | 306 | if (eventCount != nullptr) { |
| 315 | *eventCount = 2048; | 307 | *eventCount = 2048; |
| @@ -322,19 +314,6 @@ rtError_t rtGetStreamId(rtStream_t stream, int32_t *stream_id) { | |||
| 322 | return RT_ERROR_NONE; | 314 | return RT_ERROR_NONE; |
| 323 | } | 315 | } |
| 324 | 316 | ||
| 325 | -rtError_t rtCtxGetCurrent(rtContext_t *ctx) { | ||
| 326 | - if (__FUNCTION__ == g_runtime_stub_mock) { | ||
| 327 | - return -1; | ||
| 328 | - } | ||
| 329 | - uintptr_t x = 1; | ||
| 330 | - *ctx = (rtContext_t *)x; | ||
| 331 | - return RT_ERROR_NONE; | ||
| 332 | -} | ||
| 333 | - | ||
| 334 | -rtError_t rtCtxSetDryRun(rtContext_t ctx, rtDryRunFlag_t enable, uint32_t flag) { | ||
| 335 | - return RT_ERROR_NONE; | ||
| 336 | -} | ||
| 337 | - | ||
| 338 | rtError_t rtEventGetTimeStamp(uint64_t *time, rtEvent_t event) { | 317 | rtError_t rtEventGetTimeStamp(uint64_t *time, rtEvent_t event) { |
| 339 | *time = 12345; | 318 | *time = 12345; |
| 340 | return RT_ERROR_NONE; | 319 | return RT_ERROR_NONE; |
| @@ -508,10 +487,6 @@ rtError_t rtKernelLaunchWithFlagV2(const void *stubFunc, uint32_t blockDim, rtAr | |||
| 508 | return ge::RuntimeStub::GetInstance()->rtKernelLaunchWithFlagV2(stubFunc, blockDim, argsInfo, smDesc, stm, flags, | 487 | return ge::RuntimeStub::GetInstance()->rtKernelLaunchWithFlagV2(stubFunc, blockDim, argsInfo, smDesc, stm, flags, |
| 509 | cfgInfo); | 488 | cfgInfo); |
| 510 | } | 489 | } |
| 511 | -rtError_t rtKernelGetAddrAndPrefCntV2(void *handle, const uint64_t tilingKey, const void *const stubFunc, | ||
| 512 | - const uint32_t flag, rtKernelDetailInfo_t *kernelInfo) { | ||
| 513 | - return ge::RuntimeStub::GetInstance()->rtKernelGetAddrAndPrefCntV2(handle, tilingKey, stubFunc, flag, kernelInfo); | ||
| 514 | -} | ||
| 515 | rtError_t rtSetupArgument(const void *arg, uint32_t size, uint32_t offset) { | 490 | rtError_t rtSetupArgument(const void *arg, uint32_t size, uint32_t offset) { |
| 516 | return RT_ERROR_NONE; | 491 | return RT_ERROR_NONE; |
| 517 | } | 492 | } |
| @@ -529,10 +504,6 @@ rtError_t rtSetProfDir(char *prof_dir) { | |||
| 529 | return RT_ERROR_NONE; | 504 | return RT_ERROR_NONE; |
| 530 | } | 505 | } |
| 531 | 506 | ||
| 532 | -rtError_t rtAiCoreMemorySizes(rtAiCoreMemorySize_t *aicore_memory_size) { | ||
| 533 | - return RT_ERROR_NONE; | ||
| 534 | -} | ||
| 535 | - | ||
| 536 | rtError_t rtMemAdvise(void *ptr, uint64_t size, uint32_t advise) { | 507 | rtError_t rtMemAdvise(void *ptr, uint64_t size, uint32_t advise) { |
| 537 | return RT_ERROR_NONE; | 508 | return RT_ERROR_NONE; |
| 538 | } | 509 | } |
| @@ -558,12 +529,6 @@ rtError_t rtMemGetInfo(size_t *free, size_t *total) { | |||
| 558 | return RT_ERROR_NONE; | 529 | return RT_ERROR_NONE; |
| 559 | } | 530 | } |
| 560 | 531 | ||
| 561 | -rtError_t rtMemGetInfoEx(rtMemInfoType_t memInfoType, size_t *free, size_t *total) { | ||
| 562 | - *free = 16UL * 1024UL * 1024UL * 1024UL; | ||
| 563 | - *total = 32UL * 1024UL * 1024UL * 1024UL; | ||
| 564 | - return RT_ERROR_NONE; | ||
| 565 | -} | ||
| 566 | - | ||
| 567 | rtError_t rtMemAllocManaged(void **ptr, uint64_t size, uint32_t flag, const uint16_t moduleId) { | 532 | rtError_t rtMemAllocManaged(void **ptr, uint64_t size, uint32_t flag, const uint16_t moduleId) { |
| 568 | *ptr = malloc(size); | 533 | *ptr = malloc(size); |
| 569 | return RT_ERROR_NONE; | 534 | return RT_ERROR_NONE; |
| @@ -580,9 +545,6 @@ rtError_t rtMetadataRegister(void *handle, const char *meta_data) { | |||
| 580 | } | 545 | } |
| 581 | return RT_ERROR_NONE; | 546 | return RT_ERROR_NONE; |
| 582 | } | 547 | } |
| 583 | -rtError_t rtSetTaskGenCallback(rtTaskGenCallback callback) { | ||
| 584 | - return RT_ERROR_NONE; | ||
| 585 | -} | ||
| 586 | 548 | ||
| 587 | rtError_t rtGetDeviceInfo(uint32_t device_id, int32_t module_type, int32_t info_type, int64_t *val) { | 549 | rtError_t rtGetDeviceInfo(uint32_t device_id, int32_t module_type, int32_t info_type, int64_t *val) { |
| 588 | *val = 8; | 550 | *val = 8; |
| @@ -597,10 +559,6 @@ rtError_t rtGetAddrByFun(const void *stubFunc, void **addr) { | |||
| 597 | return RT_ERROR_NONE; | 559 | return RT_ERROR_NONE; |
| 598 | } | 560 | } |
| 599 | 561 | ||
| 600 | -rtError_t rtCtxCreate(rtContext_t *ctx, uint32_t flags, int32_t device) { | ||
| 601 | - return RT_ERROR_NONE; | ||
| 602 | -} | ||
| 603 | - | ||
| 604 | rtError_t rtKernelLaunchEx(void *args, uint32_t args_size, uint32_t flags, rtStream_t stream_) { | 562 | rtError_t rtKernelLaunchEx(void *args, uint32_t args_size, uint32_t flags, rtStream_t stream_) { |
| 605 | const char *const kEnvRecordPath = "CONSTANT_FOLDING_PASS_6"; | 563 | const char *const kEnvRecordPath = "CONSTANT_FOLDING_PASS_6"; |
| 606 | char record_path[MMPA_MAX_PATH] = {}; | 564 | char record_path[MMPA_MAX_PATH] = {}; |
| @@ -634,10 +592,6 @@ rtError_t rtProfilerStop(uint64_t profConfig, int32_t numsDev, uint32_t *deviceL | |||
| 634 | return RT_ERROR_NONE; | 592 | return RT_ERROR_NONE; |
| 635 | } | 593 | } |
| 636 | 594 | ||
| 637 | -rtError_t rtCtxDestroy(rtContext_t ctx) { | ||
| 638 | - return RT_ERROR_NONE; | ||
| 639 | -} | ||
| 640 | - | ||
| 641 | rtError_t rtProfilerStart(uint64_t profConfig, int32_t numsDev, uint32_t *deviceList) { | 595 | rtError_t rtProfilerStart(uint64_t profConfig, int32_t numsDev, uint32_t *deviceList) { |
| 642 | return RT_ERROR_NONE; | 596 | return RT_ERROR_NONE; |
| 643 | } | 597 | } |
| @@ -757,25 +711,6 @@ rtError_t rtSetTaskFailCallback(rtTaskFailCallback callback) { | |||
| 757 | return RT_ERROR_NONE; | 711 | return RT_ERROR_NONE; |
| 758 | } | 712 | } |
| 759 | 713 | ||
| 760 | -rtError_t rtMallocHostSharedMemory(rtMallocHostSharedMemoryIn *in, rtMallocHostSharedMemoryOut *out) { | ||
| 761 | - out->ptr = new uint8_t[in->size]; | ||
| 762 | - out->devPtr = new uint8_t[in->size]; | ||
| 763 | - return RT_ERROR_NONE; | ||
| 764 | -} | ||
| 765 | - | ||
| 766 | -rtError_t rtFreeHostSharedMemory(rtFreeHostSharedMemoryIn *in) { | ||
| 767 | - delete[] (uint8_t *)in->ptr; | ||
| 768 | - delete[] (uint8_t *)in->devPtr; | ||
| 769 | - return RT_ERROR_NONE; | ||
| 770 | -} | ||
| 771 | - | ||
| 772 | -ADD_STUB_RETURN_VALUE(rtGetAicpuDeploy, rtError_t); | ||
| 773 | -ADD_STUB_OUTBOUND_VALUE(rtGetAicpuDeploy, rtAicpuDeployType_t, value); | ||
| 774 | -rtError_t rtGetAicpuDeploy(rtAicpuDeployType_t *deplyType) { | ||
| 775 | - *deplyType = GET_STUB_OUTBOUND_VALUE(rtGetAicpuDeploy, rtAicpuDeployType_t, value, AICPU_DEPLOY_CROSS_PROCESS); | ||
| 776 | - return GET_STUB_RETURN_VALUE(rtGetAicpuDeploy, rtError_t, RT_ERROR_NONE); | ||
| 777 | -} | ||
| 778 | - | ||
| 779 | rtError_t rtSetCtxINFMode(bool mode) { | 714 | rtError_t rtSetCtxINFMode(bool mode) { |
| 780 | return RT_ERROR_NONE; | 715 | return RT_ERROR_NONE; |
| 781 | } | 716 | } |
| @@ -792,6 +727,12 @@ rtError_t rtGetRtCapability(rtFeatureType_t featureType, int32_t featureInfo, in | |||
| 792 | return RT_ERROR_NONE; | 727 | return RT_ERROR_NONE; |
| 793 | } | 728 | } |
| 794 | 729 | ||
| 730 | +typedef enum tagRtMemRequestFeature { | ||
| 731 | + MEM_REQUEST_FEATURE_DEFAULT = 0, | ||
| 732 | + MEM_REQUEST_FEATURE_OPP, | ||
| 733 | + MEM_REQUEST_FEATURE_RESERVED | ||
| 734 | +} rtMemRequestFeature_t; | ||
| 735 | + | ||
| 795 | uint32_t rtGetTsMemType(rtMemRequestFeature_t featureType, uint32_t memSize) { | 736 | uint32_t rtGetTsMemType(rtMemRequestFeature_t featureType, uint32_t memSize) { |
| 796 | return RT_MEMORY_HBM; | 737 | return RT_MEMORY_HBM; |
| 797 | } | 738 | } |
| @@ -818,10 +759,6 @@ rtError_t rtDebugUnRegisterForStream(rtStream_t stream) { | |||
| 818 | return RT_ERROR_NONE; | 759 | return RT_ERROR_NONE; |
| 819 | } | 760 | } |
| 820 | 761 | ||
| 821 | -rtError_t rtFftsTaskLaunch(rtFftsTaskInfo_t *fftsTaskInfo, rtStream_t stream) { | ||
| 822 | - return RT_ERROR_NONE; | ||
| 823 | -} | ||
| 824 | - | ||
| 825 | rtError_t rtKernelGetAddrAndPrefCnt(void *handle, const uint64_t tilingKey, const void *const stubFunc, | 762 | rtError_t rtKernelGetAddrAndPrefCnt(void *handle, const uint64_t tilingKey, const void *const stubFunc, |
| 826 | const uint32_t flag, void **addr, uint32_t *prefetchCnt) { | 763 | const uint32_t flag, void **addr, uint32_t *prefetchCnt) { |
| 827 | return RT_ERROR_NONE; | 764 | return RT_ERROR_NONE; |
| @@ -854,10 +791,6 @@ rtError_t rtProfRegisterCtrlCallback(uint32_t logId, rtProfCtrlHandle callback) | |||
| 854 | return RT_ERROR_NONE; | 791 | return RT_ERROR_NONE; |
| 855 | } | 792 | } |
| 856 | 793 | ||
| 857 | -rtError_t rtFftsTaskLaunchWithFlag(rtFftsTaskInfo_t *fftsTaskInfo, rtStream_t stream, uint32_t flag) { | ||
| 858 | - return RT_ERROR_NONE; | ||
| 859 | -} | ||
| 860 | - | ||
| 861 | rtError_t rtGetC2cCtrlAddr(uint64_t *addr, uint32_t *len) { | 794 | rtError_t rtGetC2cCtrlAddr(uint64_t *addr, uint32_t *len) { |
| 862 | return RT_ERROR_NONE; | 795 | return RT_ERROR_NONE; |
| 863 | } | 796 | } |
| @@ -12,8 +12,9 @@ | |||
| 12 | #define __INC_LLT_RUNTIME_STUB_H | 12 | #define __INC_LLT_RUNTIME_STUB_H |
| 13 | 13 | ||
| 14 | #include <vector> | 14 | #include <vector> |
| 15 | -#include "runtime/rt.h" | ||
| 16 | #include <memory> | 15 | #include <memory> |
| 16 | +#include "rt_external.h" | ||
| 17 | +#include "acl/acl_rt.h" | ||
| 17 | 18 | ||
| 18 | namespace ge { | 19 | namespace ge { |
| 19 | class RuntimeStub { | 20 | class RuntimeStub { |
| @@ -50,13 +51,7 @@ class RuntimeStub { | |||
| 50 | const rtTaskCfgInfo_t *cfgInfo) { | 51 | const rtTaskCfgInfo_t *cfgInfo) { |
| 51 | return RT_ERROR_NONE; | 52 | return RT_ERROR_NONE; |
| 52 | } | 53 | } |
| 53 | - virtual rtError_t rtKernelGetAddrAndPrefCntV2(void *handle, const uint64_t tilingKey, const void *const stubFunc, | 54 | + |
| 54 | - const uint32_t flag, rtKernelDetailInfo_t *kernelInfo) { | ||
| 55 | - kernelInfo->functionInfoNum = 1; | ||
| 56 | - kernelInfo->functionInfo[0].pcAddr = (void *)(0x1245); | ||
| 57 | - kernelInfo->functionInfo[0].prefetchCnt = 1; | ||
| 58 | - return RT_ERROR_NONE; | ||
| 59 | - } | ||
| 60 | virtual rtError_t rtCpuKernelLaunchWithFlag(const void *soName, const void *kernelName, uint32_t blockDim, | 55 | virtual rtError_t rtCpuKernelLaunchWithFlag(const void *soName, const void *kernelName, uint32_t blockDim, |
| 61 | const rtArgsEx_t *args, rtSmDesc_t *smDesc, rtStream_t stream, | 56 | const rtArgsEx_t *args, rtSmDesc_t *smDesc, rtStream_t stream, |
| 62 | uint32_t flags) { | 57 | uint32_t flags) { |
| @@ -186,9 +181,6 @@ RTS_STUB_OUTBOUND_EXTERN(rtEventCreate, uint32_t, event_id); | |||
| 186 | 181 | ||
| 187 | RTS_STUB_RETURN_EXTERN(rtQueryFunctionRegistered, rtError_t); | 182 | RTS_STUB_RETURN_EXTERN(rtQueryFunctionRegistered, rtError_t); |
| 188 | 183 | ||
| 189 | -RTS_STUB_RETURN_EXTERN(rtGetAicpuDeploy, rtError_t); | ||
| 190 | -RTS_STUB_OUTBOUND_EXTERN(rtGetAicpuDeploy, rtAicpuDeployType_t, value); | ||
| 191 | - | ||
| 192 | RTS_STUB_RETURN_EXTERN(rtProfilerTraceEx, rtError_t); | 184 | RTS_STUB_RETURN_EXTERN(rtProfilerTraceEx, rtError_t); |
| 193 | 185 | ||
| 194 | RTS_STUB_RETURN_EXTERN(rtNpuGetFloatStatus, rtError_t); | 186 | RTS_STUB_RETURN_EXTERN(rtNpuGetFloatStatus, rtError_t); |
| @@ -15,8 +15,9 @@ | |||
| 15 | #include "securec.h" | 15 | #include "securec.h" |
| 16 | #include "mmpa/mmpa_api.h" | 16 | #include "mmpa/mmpa_api.h" |
| 17 | #include "runtime_stub.h" | 17 | #include "runtime_stub.h" |
| 18 | -#include "runtime/rt.h" | 18 | +#include "rt_external.h" |
| 19 | -#include "runtime/rt_preload_task.h" | 19 | +#include "acl/acl_rt.h" |
| 20 | +#include "rt_external_preload.h" | ||
| 20 | 21 | ||
| 21 | extern std::string g_runtime_stub_mock; | 22 | extern std::string g_runtime_stub_mock; |
| 22 | std::string g_runtime_stub_mock = ""; | 23 | std::string g_runtime_stub_mock = ""; |
| @@ -261,8 +262,11 @@ rtError_t rtGetDevice(int32_t *device) { | |||
| 261 | ADD_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t); | 262 | ADD_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t); |
| 262 | ADD_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value); | 263 | ADD_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value); |
| 263 | rtError_t rtGetDeviceCapability(int32_t device, int32_t moduleType, int32_t featureType, int32_t *value) { | 264 | rtError_t rtGetDeviceCapability(int32_t device, int32_t moduleType, int32_t featureType, int32_t *value) { |
| 264 | - *value = GET_STUB_OUTBOUND_VALUE(rtGetDeviceCapability, int32_t, value, RT_AICPU_BLOCKING_OP_SUPPORT); | 265 | + (void)device; |
| 265 | - return GET_STUB_RETURN_VALUE(rtGetDeviceCapability, rtError_t, RT_ERROR_NONE); | 266 | + (void)moduleType; |
| 267 | + (void)featureType; | ||
| 268 | + *value = 16; | ||
| 269 | + return RT_ERROR_NONE; | ||
| 266 | } | 270 | } |
| 267 | 271 | ||
| 268 | ADD_STUB_RETURN_VALUE(rtStreamWaitEvent, rtError_t); | 272 | ADD_STUB_RETURN_VALUE(rtStreamWaitEvent, rtError_t); |
| @@ -298,17 +302,6 @@ rtError_t rtQueryFunctionRegistered(const char *stub_name) { | |||
| 298 | return GET_STUB_RETURN_VALUE(rtQueryFunctionRegistered, rtError_t, RT_ERROR_NONE); | 302 | return GET_STUB_RETURN_VALUE(rtQueryFunctionRegistered, rtError_t, RT_ERROR_NONE); |
| 299 | } | 303 | } |
| 300 | 304 | ||
| 301 | -rtError_t rtCtxSetCurrent(rtContext_t ctx) { | ||
| 302 | - const char *const kEnvRecordPath = "SET_TRANS_VAR_DATA"; | ||
| 303 | - char record_path[MMPA_MAX_PATH] = {}; | ||
| 304 | - (void)mmGetEnv(kEnvRecordPath, &record_path[0], static_cast<uint32_t>(MMPA_MAX_PATH)); | ||
| 305 | - | ||
| 306 | - if (std::string(&record_path[0]).find("mock_fail") != std::string::npos) { | ||
| 307 | - return -1; | ||
| 308 | - } | ||
| 309 | - return RT_ERROR_NONE; | ||
| 310 | -} | ||
| 311 | - | ||
| 312 | rtError_t rtGetAvailEventNum(uint32_t *const eventCount) { | 305 | rtError_t rtGetAvailEventNum(uint32_t *const eventCount) { |
| 313 | if (eventCount != nullptr) { | 306 | if (eventCount != nullptr) { |
| 314 | *eventCount = 2048; | 307 | *eventCount = 2048; |
| @@ -321,19 +314,6 @@ rtError_t aclrtStreamGetId(rtStream_t stream, int32_t *stream_id) { | |||
| 321 | return RT_ERROR_NONE; | 314 | return RT_ERROR_NONE; |
| 322 | } | 315 | } |
| 323 | 316 | ||
| 324 | -rtError_t rtCtxGetCurrent(rtContext_t *ctx) { | ||
| 325 | - if (__FUNCTION__ == g_runtime_stub_mock) { | ||
| 326 | - return -1; | ||
| 327 | - } | ||
| 328 | - uintptr_t x = 1; | ||
| 329 | - *ctx = (rtContext_t *)x; | ||
| 330 | - return RT_ERROR_NONE; | ||
| 331 | -} | ||
| 332 | - | ||
| 333 | -rtError_t rtCtxSetDryRun(rtContext_t ctx, rtDryRunFlag_t enable, uint32_t flag) { | ||
| 334 | - return RT_ERROR_NONE; | ||
| 335 | -} | ||
| 336 | - | ||
| 337 | rtError_t rtEventGetTimeStamp(uint64_t *time, rtEvent_t event) { | 317 | rtError_t rtEventGetTimeStamp(uint64_t *time, rtEvent_t event) { |
| 338 | *time = 12345; | 318 | *time = 12345; |
| 339 | return RT_ERROR_NONE; | 319 | return RT_ERROR_NONE; |
| @@ -507,10 +487,7 @@ rtError_t rtKernelLaunchWithFlagV2(const void *stubFunc, uint32_t blockDim, rtAr | |||
| 507 | return ge::RuntimeStub::GetInstance()->rtKernelLaunchWithFlagV2(stubFunc, blockDim, argsInfo, smDesc, stm, flags, | 487 | return ge::RuntimeStub::GetInstance()->rtKernelLaunchWithFlagV2(stubFunc, blockDim, argsInfo, smDesc, stm, flags, |
| 508 | cfgInfo); | 488 | cfgInfo); |
| 509 | } | 489 | } |
| 510 | -rtError_t rtKernelGetAddrAndPrefCntV2(void *handle, const uint64_t tilingKey, const void *const stubFunc, | 490 | + |
| 511 | - const uint32_t flag, rtKernelDetailInfo_t *kernelInfo) { | ||
| 512 | - return ge::RuntimeStub::GetInstance()->rtKernelGetAddrAndPrefCntV2(handle, tilingKey, stubFunc, flag, kernelInfo); | ||
| 513 | -} | ||
| 514 | rtError_t rtSetupArgument(const void *arg, uint32_t size, uint32_t offset) { | 491 | rtError_t rtSetupArgument(const void *arg, uint32_t size, uint32_t offset) { |
| 515 | return RT_ERROR_NONE; | 492 | return RT_ERROR_NONE; |
| 516 | } | 493 | } |
| @@ -528,10 +505,6 @@ rtError_t rtSetProfDir(char *prof_dir) { | |||
| 528 | return RT_ERROR_NONE; | 505 | return RT_ERROR_NONE; |
| 529 | } | 506 | } |
| 530 | 507 | ||
| 531 | -rtError_t rtAiCoreMemorySizes(rtAiCoreMemorySize_t *aicore_memory_size) { | ||
| 532 | - return RT_ERROR_NONE; | ||
| 533 | -} | ||
| 534 | - | ||
| 535 | rtError_t rtMemAdvise(void *ptr, uint64_t size, uint32_t advise) { | 508 | rtError_t rtMemAdvise(void *ptr, uint64_t size, uint32_t advise) { |
| 536 | return RT_ERROR_NONE; | 509 | return RT_ERROR_NONE; |
| 537 | } | 510 | } |
| @@ -557,12 +530,6 @@ rtError_t rtMemGetInfo(size_t *free, size_t *total) { | |||
| 557 | return RT_ERROR_NONE; | 530 | return RT_ERROR_NONE; |
| 558 | } | 531 | } |
| 559 | 532 | ||
| 560 | -rtError_t rtMemGetInfoEx(rtMemInfoType_t memInfoType, size_t *free, size_t *total) { | ||
| 561 | - *free = 16UL * 1024UL * 1024UL * 1024UL; | ||
| 562 | - *total = 32UL * 1024UL * 1024UL * 1024UL; | ||
| 563 | - return RT_ERROR_NONE; | ||
| 564 | -} | ||
| 565 | - | ||
| 566 | rtError_t rtMemAllocManaged(void **ptr, uint64_t size, uint32_t flag, const uint16_t moduleId) { | 533 | rtError_t rtMemAllocManaged(void **ptr, uint64_t size, uint32_t flag, const uint16_t moduleId) { |
| 567 | *ptr = malloc(size); | 534 | *ptr = malloc(size); |
| 568 | return RT_ERROR_NONE; | 535 | return RT_ERROR_NONE; |
| @@ -579,9 +546,6 @@ rtError_t rtMetadataRegister(void *handle, const char *meta_data) { | |||
| 579 | } | 546 | } |
| 580 | return RT_ERROR_NONE; | 547 | return RT_ERROR_NONE; |
| 581 | } | 548 | } |
| 582 | -rtError_t rtSetTaskGenCallback(rtTaskGenCallback callback) { | ||
| 583 | - return RT_ERROR_NONE; | ||
| 584 | -} | ||
| 585 | 549 | ||
| 586 | rtError_t rtGetDeviceInfo(uint32_t device_id, int32_t module_type, int32_t info_type, int64_t *val) { | 550 | rtError_t rtGetDeviceInfo(uint32_t device_id, int32_t module_type, int32_t info_type, int64_t *val) { |
| 587 | *val = 8; | 551 | *val = 8; |
| @@ -596,10 +560,6 @@ rtError_t rtGetAddrByFun(const void *stubFunc, void **addr) { | |||
| 596 | return RT_ERROR_NONE; | 560 | return RT_ERROR_NONE; |
| 597 | } | 561 | } |
| 598 | 562 | ||
| 599 | -rtError_t rtCtxCreate(rtContext_t *ctx, uint32_t flags, int32_t device) { | ||
| 600 | - return RT_ERROR_NONE; | ||
| 601 | -} | ||
| 602 | - | ||
| 603 | rtError_t rtKernelLaunchEx(void *args, uint32_t args_size, uint32_t flags, rtStream_t stream_) { | 563 | rtError_t rtKernelLaunchEx(void *args, uint32_t args_size, uint32_t flags, rtStream_t stream_) { |
| 604 | const char *const kEnvRecordPath = "CONSTANT_FOLDING_PASS_6"; | 564 | const char *const kEnvRecordPath = "CONSTANT_FOLDING_PASS_6"; |
| 605 | char record_path[MMPA_MAX_PATH] = {}; | 565 | char record_path[MMPA_MAX_PATH] = {}; |
| @@ -633,10 +593,6 @@ rtError_t rtProfilerStop(uint64_t profConfig, int32_t numsDev, uint32_t *deviceL | |||
| 633 | return RT_ERROR_NONE; | 593 | return RT_ERROR_NONE; |
| 634 | } | 594 | } |
| 635 | 595 | ||
| 636 | -rtError_t rtCtxDestroy(rtContext_t ctx) { | ||
| 637 | - return RT_ERROR_NONE; | ||
| 638 | -} | ||
| 639 | - | ||
| 640 | rtError_t rtProfilerStart(uint64_t profConfig, int32_t numsDev, uint32_t *deviceList) { | 596 | rtError_t rtProfilerStart(uint64_t profConfig, int32_t numsDev, uint32_t *deviceList) { |
| 641 | return RT_ERROR_NONE; | 597 | return RT_ERROR_NONE; |
| 642 | } | 598 | } |
| @@ -756,25 +712,6 @@ rtError_t rtSetTaskFailCallback(rtTaskFailCallback callback) { | |||
| 756 | return RT_ERROR_NONE; | 712 | return RT_ERROR_NONE; |
| 757 | } | 713 | } |
| 758 | 714 | ||
| 759 | -rtError_t rtMallocHostSharedMemory(rtMallocHostSharedMemoryIn *in, rtMallocHostSharedMemoryOut *out) { | ||
| 760 | - out->ptr = new uint8_t[in->size]; | ||
| 761 | - out->devPtr = new uint8_t[in->size]; | ||
| 762 | - return RT_ERROR_NONE; | ||
| 763 | -} | ||
| 764 | - | ||
| 765 | -rtError_t rtFreeHostSharedMemory(rtFreeHostSharedMemoryIn *in) { | ||
| 766 | - delete[] (uint8_t *)in->ptr; | ||
| 767 | - delete[] (uint8_t *)in->devPtr; | ||
| 768 | - return RT_ERROR_NONE; | ||
| 769 | -} | ||
| 770 | - | ||
| 771 | -ADD_STUB_RETURN_VALUE(rtGetAicpuDeploy, rtError_t); | ||
| 772 | -ADD_STUB_OUTBOUND_VALUE(rtGetAicpuDeploy, rtAicpuDeployType_t, value); | ||
| 773 | -rtError_t rtGetAicpuDeploy(rtAicpuDeployType_t *deplyType) { | ||
| 774 | - *deplyType = GET_STUB_OUTBOUND_VALUE(rtGetAicpuDeploy, rtAicpuDeployType_t, value, AICPU_DEPLOY_CROSS_PROCESS); | ||
| 775 | - return GET_STUB_RETURN_VALUE(rtGetAicpuDeploy, rtError_t, RT_ERROR_NONE); | ||
| 776 | -} | ||
| 777 | - | ||
| 778 | rtError_t rtSetCtxINFMode(bool mode) { | 715 | rtError_t rtSetCtxINFMode(bool mode) { |
| 779 | return RT_ERROR_NONE; | 716 | return RT_ERROR_NONE; |
| 780 | } | 717 | } |
| @@ -791,6 +728,12 @@ rtError_t rtGetRtCapability(rtFeatureType_t featureType, int32_t featureInfo, in | |||
| 791 | return RT_ERROR_NONE; | 728 | return RT_ERROR_NONE; |
| 792 | } | 729 | } |
| 793 | 730 | ||
| 731 | +typedef enum tagRtMemRequestFeature { | ||
| 732 | + MEM_REQUEST_FEATURE_DEFAULT = 0, | ||
| 733 | + MEM_REQUEST_FEATURE_OPP, | ||
| 734 | + MEM_REQUEST_FEATURE_RESERVED | ||
| 735 | +} rtMemRequestFeature_t; | ||
| 736 | + | ||
| 794 | uint32_t rtGetTsMemType(rtMemRequestFeature_t featureType, uint32_t memSize) { | 737 | uint32_t rtGetTsMemType(rtMemRequestFeature_t featureType, uint32_t memSize) { |
| 795 | return RT_MEMORY_HBM; | 738 | return RT_MEMORY_HBM; |
| 796 | } | 739 | } |
| @@ -817,10 +760,6 @@ rtError_t rtDebugUnRegisterForStream(rtStream_t stream) { | |||
| 817 | return RT_ERROR_NONE; | 760 | return RT_ERROR_NONE; |
| 818 | } | 761 | } |
| 819 | 762 | ||
| 820 | -rtError_t rtFftsTaskLaunch(rtFftsTaskInfo_t *fftsTaskInfo, rtStream_t stream) { | ||
| 821 | - return RT_ERROR_NONE; | ||
| 822 | -} | ||
| 823 | - | ||
| 824 | rtError_t rtKernelGetAddrAndPrefCnt(void *handle, const uint64_t tilingKey, const void *const stubFunc, | 763 | rtError_t rtKernelGetAddrAndPrefCnt(void *handle, const uint64_t tilingKey, const void *const stubFunc, |
| 825 | const uint32_t flag, void **addr, uint32_t *prefetchCnt) { | 764 | const uint32_t flag, void **addr, uint32_t *prefetchCnt) { |
| 826 | return RT_ERROR_NONE; | 765 | return RT_ERROR_NONE; |
| @@ -853,10 +792,6 @@ rtError_t rtProfRegisterCtrlCallback(uint32_t logId, rtProfCtrlHandle callback) | |||
| 853 | return RT_ERROR_NONE; | 792 | return RT_ERROR_NONE; |
| 854 | } | 793 | } |
| 855 | 794 | ||
| 856 | -rtError_t rtFftsTaskLaunchWithFlag(rtFftsTaskInfo_t *fftsTaskInfo, rtStream_t stream, uint32_t flag) { | ||
| 857 | - return RT_ERROR_NONE; | ||
| 858 | -} | ||
| 859 | - | ||
| 860 | rtError_t rtGetC2cCtrlAddr(uint64_t *addr, uint32_t *len) { | 795 | rtError_t rtGetC2cCtrlAddr(uint64_t *addr, uint32_t *len) { |
| 861 | return RT_ERROR_NONE; | 796 | return RT_ERROR_NONE; |
| 862 | } | 797 | } |
| @@ -12,7 +12,8 @@ | |||
| 12 | #define __INC_LLT_RUNTIME_STUB_H | 12 | #define __INC_LLT_RUNTIME_STUB_H |
| 13 | 13 | ||
| 14 | #include <vector> | 14 | #include <vector> |
| 15 | -#include "runtime/rt.h" | 15 | +#include "acl/acl_rt.h" |
| 16 | +#include "rt_external.h" | ||
| 16 | #include <memory> | 17 | #include <memory> |
| 17 | 18 | ||
| 18 | namespace ge { | 19 | namespace ge { |
| @@ -50,13 +51,6 @@ class RuntimeStub { | |||
| 50 | const rtTaskCfgInfo_t *cfgInfo) { | 51 | const rtTaskCfgInfo_t *cfgInfo) { |
| 51 | return RT_ERROR_NONE; | 52 | return RT_ERROR_NONE; |
| 52 | } | 53 | } |
| 53 | - virtual rtError_t rtKernelGetAddrAndPrefCntV2(void *handle, const uint64_t tilingKey, const void *const stubFunc, | ||
| 54 | - const uint32_t flag, rtKernelDetailInfo_t *kernelInfo) { | ||
| 55 | - kernelInfo->functionInfoNum = 1; | ||
| 56 | - kernelInfo->functionInfo[0].pcAddr = (void *)(0x1245); | ||
| 57 | - kernelInfo->functionInfo[0].prefetchCnt = 1; | ||
| 58 | - return RT_ERROR_NONE; | ||
| 59 | - } | ||
| 60 | virtual rtError_t rtCpuKernelLaunchWithFlag(const void *soName, const void *kernelName, uint32_t blockDim, | 54 | virtual rtError_t rtCpuKernelLaunchWithFlag(const void *soName, const void *kernelName, uint32_t blockDim, |
| 61 | const rtArgsEx_t *args, rtSmDesc_t *smDesc, rtStream_t stream, | 55 | const rtArgsEx_t *args, rtSmDesc_t *smDesc, rtStream_t stream, |
| 62 | uint32_t flags) { | 56 | uint32_t flags) { |
| @@ -186,9 +180,6 @@ RTS_STUB_OUTBOUND_EXTERN(rtEventCreate, uint32_t, event_id); | |||
| 186 | 180 | ||
| 187 | RTS_STUB_RETURN_EXTERN(rtQueryFunctionRegistered, rtError_t); | 181 | RTS_STUB_RETURN_EXTERN(rtQueryFunctionRegistered, rtError_t); |
| 188 | 182 | ||
| 189 | -RTS_STUB_RETURN_EXTERN(rtGetAicpuDeploy, rtError_t); | ||
| 190 | -RTS_STUB_OUTBOUND_EXTERN(rtGetAicpuDeploy, rtAicpuDeployType_t, value); | ||
| 191 | - | ||
| 192 | RTS_STUB_RETURN_EXTERN(rtProfilerTraceEx, rtError_t); | 183 | RTS_STUB_RETURN_EXTERN(rtProfilerTraceEx, rtError_t); |
| 193 | 184 | ||
| 194 | RTS_STUB_RETURN_EXTERN(rtNpuGetFloatStatus, rtError_t); | 185 | RTS_STUB_RETURN_EXTERN(rtNpuGetFloatStatus, rtError_t); |