优化host侧宏-asc-devkit-AtomGit

Star725

Star725

已合并

优化host侧宏 #5321

JC1126创建于 11 天前从JC1126/asc-devkit： jc_0825 合入到 cann/asc-devkit： master

优化host侧宏 #5321

已合并

JC1126创建于 11 天前

从JC1126/asc-devkit jc_0825合入到cann/asc-devkit master

共 4 个文件变更+2-6

Minclude/c_api/asc_reg_vector.h+1-1

	@@ -15,7 +15,7 @@
15	#ifndef INCLUDE_C_API_ASC_REG_VECTOR_H	15	#ifndef INCLUDE_C_API_ASC_REG_VECTOR_H
16	#define INCLUDE_C_API_ASC_REG_VECTOR_H	16	#define INCLUDE_C_API_ASC_REG_VECTOR_H
17		17
18	-#if (defined(__NPU_ARCH__) && (__NPU_ARCH__ == 3510))	18	+#if !defined(__NPU_ARCH__) \|\| (defined(__NPU_ARCH__) && (__NPU_ARCH__ == 3510))
19	#include "utils/base/helpers.h"	19	#include "utils/base/helpers.h"
20	#include "utils/debug/asc_assert.h"	20	#include "utils/debug/asc_assert.h"
21	#include "utils/debug/asc_dump.h"	21	#include "utils/debug/asc_dump.h"

Minclude/c_api/asc_simd.h+1-1

	@@ -23,7 +23,7 @@
23	#include "c_api/asc_cube.h"	23	#include "c_api/asc_cube.h"
24	#include "c_api/asc_memory_vector.h"	24	#include "c_api/asc_memory_vector.h"
25		25
26	-#if (defined(__NPU_ARCH__) && (__NPU_ARCH__ == 3510))	26	+#if !defined(__NPU_ARCH__) \|\| (defined(__NPU_ARCH__) && (__NPU_ARCH__ == 3510))
27	#include "c_api/asc_reg_vector.h"	27	#include "c_api/asc_reg_vector.h"
28	#endif	28	#endif
29		29

Minclude/c_api/atomic/scalar_atomic.h+0-2

	@@ -85,11 +85,9 @@ __aicore__ inline void asc_get_store_atomic_config(asc_store_atomic_config& conf
85		85
86	__aicore__ inline void asc_set_store_atomic_config_v1(uint16_t type, uint16_t op);	86	__aicore__ inline void asc_set_store_atomic_config_v1(uint16_t type, uint16_t op);
87		87
88	-#if defined(__NPU_ARCH__) && (__NPU_ARCH__ == 3510)
89	[[deprecated("NOTICE: asc_set_store_atomic_config_v2 is deprecated."	88	[[deprecated("NOTICE: asc_set_store_atomic_config_v2 is deprecated."
90	"Please use asc_atomic_add instead for atomic add operation.")]] __aicore__ inline void	89	"Please use asc_atomic_add instead for atomic add operation.")]] __aicore__ inline void
91	asc_set_store_atomic_config_v2(uint16_t type, uint16_t op);	90	asc_set_store_atomic_config_v2(uint16_t type, uint16_t op);
92	-#endif
93		91
94	#endif	92	#endif
95		93

Mtests/api/c_api/ascendc_host_header_checker/host_header_atomic_checker.cpp+0-2

	@@ -33,7 +33,5 @@ static void test_host_c_api_atomic_0()
33	using ::asc_set_atomic_min_int8;	33	using ::asc_set_atomic_min_int8;
34	using ::asc_set_atomic_none;	34	using ::asc_set_atomic_none;
35	using ::asc_set_store_atomic_config_v1;	35	using ::asc_set_store_atomic_config_v1;
36	-#if defined(__NPU_ARCH__) && (__NPU_ARCH__ == 3510)
37	using ::asc_set_store_atomic_config_v2;	36	using ::asc_set_store_atomic_config_v2;
38	-#endif
39	}	37	}