已合并
【PR】: fix code alarm #2970
xiachanglin创建于 6月18日
【PR】: fix code alarm #2970
已合并
从已删除 :9.1.0合入到cann/runtime9.1.0
共 10 个文件变更+24-22
| @@ -18,15 +18,15 @@ extern "C" { | |||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | typedef enum rtAtomicOperationCapability { | 20 | typedef enum rtAtomicOperationCapability { |
| 21 | - RT_ATOMIC_CAPABILITY_SIGNED = 1U << 0, | 21 | + RT_ATOMIC_CAPABILITY_SIGNED = 1U << 0U, |
| 22 | - RT_ATOMIC_CAPABILITY_UNSIGNED = 1U << 1, | 22 | + RT_ATOMIC_CAPABILITY_UNSIGNED = 1U << 1U, |
| 23 | - RT_ATOMIC_CAPABILITY_REDUCATION = 1U << 2, | 23 | + RT_ATOMIC_CAPABILITY_REDUCATION = 1U << 2U, |
| 24 | - RT_ATOMIC_CAPABILITY_SCALAR8 = 1U << 3, | 24 | + RT_ATOMIC_CAPABILITY_SCALAR8 = 1U << 3U, |
| 25 | - RT_ATOMIC_CAPABILITY_SCALAR16 = 1U << 4, | 25 | + RT_ATOMIC_CAPABILITY_SCALAR16 = 1U << 4U, |
| 26 | - RT_ATOMIC_CAPABILITY_SCALAR32 = 1U << 5, | 26 | + RT_ATOMIC_CAPABILITY_SCALAR32 = 1U << 5U, |
| 27 | - RT_ATOMIC_CAPABILITY_SCALAR64 = 1U << 6, | 27 | + RT_ATOMIC_CAPABILITY_SCALAR64 = 1U << 6U, |
| 28 | - RT_ATOMIC_CAPABILITY_SCALAR128 = 1U << 7, | 28 | + RT_ATOMIC_CAPABILITY_SCALAR128 = 1U << 7U, |
| 29 | - RT_ATOMIC_CAPABILITY_VECTOR32X4 = 1U << 8, | 29 | + RT_ATOMIC_CAPABILITY_VECTOR32X4 = 1U << 8U, |
| 30 | } rtAtomicOperationCapability; | 30 | } rtAtomicOperationCapability; |
| 31 | 31 | ||
| 32 | typedef enum rtAtomicOperation { | 32 | typedef enum rtAtomicOperation { |
| @@ -110,7 +110,7 @@ RTS_API rtError_t rtMemPoolCreate(rtMemPool_t *memPool, const rtMemPoolProps *po | |||
| 110 | * @return RT_ERROR_NONE for ok | 110 | * @return RT_ERROR_NONE for ok |
| 111 | * @return RT_ERROR_INVALID_VALUE for error input | 111 | * @return RT_ERROR_INVALID_VALUE for error input |
| 112 | */ | 112 | */ |
| 113 | -RTS_API rtError_t rtMemPoolDestroy(const rtMemPool_t memPool); | 113 | +RTS_API rtError_t rtMemPoolDestroy(rtMemPool_t const memPool); |
| 114 | 114 | ||
| 115 | /** | 115 | /** |
| 116 | * @ingroup rt_mem | 116 | * @ingroup rt_mem |
| @@ -214,9 +214,9 @@ public: | |||
| 214 | virtual rtError_t GetTaskBufferLen(const rtTaskBuffType_t type, uint32_t * const bufferLen) = 0; | 214 | virtual rtError_t GetTaskBufferLen(const rtTaskBuffType_t type, uint32_t * const bufferLen) = 0; |
| 215 | virtual rtError_t TaskSqeBuild(const rtTaskInput_t * const taskInput, uint32_t * const taskLen) = 0; | 215 | virtual rtError_t TaskSqeBuild(const rtTaskInput_t * const taskInput, uint32_t * const taskLen) = 0; |
| 216 | virtual rtError_t GetKernelBin(const char_t *const binFileName, char_t **const buffer, uint32_t *length) = 0; | 216 | virtual rtError_t GetKernelBin(const char_t *const binFileName, char_t **const buffer, uint32_t *length) = 0; |
| 217 | - virtual rtError_t GetBinBuffer(const rtBinHandle binHandle, const rtBinBufferType_t type, void **bin, | 217 | + virtual rtError_t GetBinBuffer(rtBinHandle const binHandle, const rtBinBufferType_t type, void **bin, |
| 218 | uint32_t *binSize) = 0; | 218 | uint32_t *binSize) = 0; |
| 219 | - virtual rtError_t GetStackBuffer(const rtBinHandle binHandle, uint32_t deviceId, const uint32_t stackType, const uint32_t coreType, const uint32_t coreId, | 219 | + virtual rtError_t GetStackBuffer(rtBinHandle const binHandle, uint32_t deviceId, const uint32_t stackType, const uint32_t coreType, const uint32_t coreId, |
| 220 | const void **stack, uint32_t *stackSize) = 0; | 220 | const void **stack, uint32_t *stackSize) = 0; |
| 221 | virtual rtError_t BinaryGetGlobal(const Program * const binHandle, const char *name, void **dptr, size_t *size) = 0; | 221 | virtual rtError_t BinaryGetGlobal(const Program * const binHandle, const char *name, void **dptr, size_t *size) = 0; |
| 222 | virtual rtError_t FreeKernelBin(char_t * const buffer) = 0; | 222 | virtual rtError_t FreeKernelBin(char_t * const buffer) = 0; |
| @@ -72,7 +72,7 @@ public: | |||
| 72 | condType_ = type; | 72 | condType_ = type; |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | - rtCondTaskType_t GetCondType() | 75 | + rtCondTaskType_t GetCondType() const |
| 76 | { | 76 | { |
| 77 | return condType_; | 77 | return condType_; |
| 78 | } | 78 | } |
| @@ -46,9 +46,9 @@ enum class DumpType : uint32_t { | |||
| 46 | DUMP_BUFI, | 46 | DUMP_BUFI, |
| 47 | DUMP_BUFO, | 47 | DUMP_BUFO, |
| 48 | DUMP_SKIP, | 48 | DUMP_SKIP, |
| 49 | - DUMP_SIMT_ASSERT = 0xF0E00F0E, | 49 | + DUMP_SIMT_ASSERT = 0xF0E00F0EU, |
| 50 | - DUMP_SIMT_PRINTF = 0xF0F00F0F, | 50 | + DUMP_SIMT_PRINTF = 0xF0F00F0FU, |
| 51 | - DUMP_WAIT = 0xF0A55A0F | 51 | + DUMP_WAIT = 0xF0A55A0FU |
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | 54 | ||
| @@ -173,7 +173,7 @@ public: | |||
| 173 | rtError_t StreamAddCondTask(rtCondTaskParams params, Stream * const stm, uint32_t flags) override; | 173 | rtError_t StreamAddCondTask(rtCondTaskParams params, Stream * const stm, uint32_t flags) override; |
| 174 | 174 | ||
| 175 | protected: | 175 | protected: |
| 176 | - rtError_t GetDevRunningStreamSnapshotMsg(const rtGetMsgCallback callback) override; | 176 | + rtError_t GetDevRunningStreamSnapshotMsg(rtGetMsgCallback const callback) override; |
| 177 | 177 | ||
| 178 | private: | 178 | private: |
| 179 | rtError_t CaptureRecordEvent(Context * const ctx, Event * const evt, Stream * const stm); | 179 | rtError_t CaptureRecordEvent(Context * const ctx, Event * const evt, Stream * const stm); |
| @@ -178,7 +178,8 @@ void FillKernelLaunchExtInfo(struct MsprofRuntimeTrack &runtimeTrack, const Task | |||
| 178 | ChangeTrackDataTaskType(runtimeTrack, taskInfo); | 178 | ChangeTrackDataTaskType(runtimeTrack, taskInfo); |
| 179 | const auto &aicTaskInfo = taskInfo->u.aicTaskInfo; | 179 | const auto &aicTaskInfo = taskInfo->u.aicTaskInfo; |
| 180 | const uint32_t argsSize = aicTaskInfo.comm.argsSize - aicTaskInfo.simtParamOffset; | 180 | const uint32_t argsSize = aicTaskInfo.comm.argsSize - aicTaskInfo.simtParamOffset; |
| 181 | - const uint16_t argsSizeU16 = (argsSize > UINT16_MAX) ? UINT16_MAX : static_cast<uint16_t>(argsSize); | 181 | + const uint16_t argsSizeU16 = |
| 182 | + static_cast<uint16_t>((argsSize > UINT16_MAX) ? UINT16_MAX : argsSize); | ||
| 182 | if (IsPureSimtTask(aicTaskInfo)) { | 183 | if (IsPureSimtTask(aicTaskInfo)) { |
| 183 | const rtDim3 &gridDim = aicTaskInfo.gridDim; | 184 | const rtDim3 &gridDim = aicTaskInfo.gridDim; |
| 184 | const rtDim3 &blockDim = aicTaskInfo.blockDim; | 185 | const rtDim3 &blockDim = aicTaskInfo.blockDim; |