Refactor: src/ layout cleanup (extract aicpu + rename platform/src→shared + consolidate common/)#950
Merged
Conversation
📝 WalkthroughWalkthroughThis PR reorganizes the platform source code structure by consolidating shared implementations into a unified ChangesPlatform refactoring and header consolidation
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly related PRs
Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request consolidates and reorganizes platform-specific code and documentation, moving shared profiling framework headers, device memory allocation, logging, and other utilities from architecture-specific directories (such as src/a2a3/ and src/a5/) into a unified src/common/ directory structure. The review feedback points out several outdated file paths and links in both code comments and documentation files (including dep_gen.h, scope_stats.h, and various Markdown files under docs/) that still reference the old architecture-specific paths instead of the newly consolidated shared locations. Additionally, a typo in docs/dfx/scope-stats.md was identified where the device-side scope stats collector file is incorrectly named scope_stats_collector.cpp instead of scope_stats_collector_aicpu.cpp.
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 4
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (2)
tests/ut/cpp/CMakeLists.txt (2)
254-259:⚠️ Potential issue | 🔴 Critical | ⚡ Quick winFix stale
src/common/device_comminclude directories (point tosrc/common/utils).
tests/ut/cpp/CMakeLists.txtstill adds${CMAKE_SOURCE_DIR}/../../../src/common/device_comm(e.g.,add_common_utils_test, and also ina2a3_rt_objs/a5_rt_objsinclude dirs), butsrc/common/device_commno longer exists whiledevice_arena.his now atsrc/common/utils/device_arena.h. The UTs include it as#include "device_arena.h", so update the include dirs tosrc/common/utils(or update the includes to match the newutils/...prefix).🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@tests/ut/cpp/CMakeLists.txt` around lines 254 - 259, The CMake include path for device_arena.h is stale: update occurrences that add "${CMAKE_SOURCE_DIR}/../../../src/common/device_comm" (seen in targets like add_common_utils_test, a2a3_rt_objs, a5_rt_objs) to point to "${CMAKE_SOURCE_DIR}/../../../src/common/utils" so the tests can find device_arena.h (or alternatively change the test source includes to use "utils/device_arena.h"); modify the include_directories / target_include_directories entries that reference device_comm to use the utils directory instead.
315-318:⚠️ Potential issue | 🔴 Critical | ⚡ Quick win
test_orch_so_filereferences a stale deleteda2a3source path
tests/ut/cpp/CMakeLists.txtstill buildstest_orch_so_filefrom${CMAKE_SOURCE_DIR}/../../../src/a2a3/platform/onboard/aicpu/orch_so_file.cpp, but that file no longer exists;orch_so_file.cppnow lives undersrc/common/platform/onboard/aicpu/, so CMake/configure/build will fail.🐛 Proposed fix (switch to consolidated common path)
add_executable(test_orch_so_file common/test_orch_so_file.cpp - ${CMAKE_SOURCE_DIR}/../../../src/a2a3/platform/onboard/aicpu/orch_so_file.cpp + ${CMAKE_SOURCE_DIR}/../../../src/common/platform/onboard/aicpu/orch_so_file.cpp )🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@tests/ut/cpp/CMakeLists.txt` around lines 315 - 318, The CMake target test_orch_so_file is referencing a deleted source path under src/a2a3; update the add_executable source list so that test_orch_so_file uses the relocated file at src/common/platform/onboard/aicpu/orch_so_file.cpp (replace the old ${CMAKE_SOURCE_DIR}/../../../src/a2a3/platform/onboard/aicpu/orch_so_file.cpp entry with the consolidated ${CMAKE_SOURCE_DIR}/../../../src/common/platform/onboard/aicpu/orch_so_file.cpp path) so CMake can find orch_so_file.cpp when configuring and building.
🧹 Nitpick comments (1)
src/a5/platform/onboard/host/CMakeLists.txt (1)
24-26: 💤 Low valueDuplicate
commoninclude path.Line 26 re-adds
${CMAKE_CURRENT_SOURCE_DIR}/../../../../common, which is already appended on line 24. The a2a3 onboard-host sibling lists it only once. Harmless (CMake de-duplicates include dirs) but redundant — drop one for clarity.♻️ Remove the redundant entry
list(APPEND CMAKE_CUSTOM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common") list(APPEND CMAKE_CUSTOM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common/log/include") -list(APPEND CMAKE_CUSTOM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common") list(APPEND CMAKE_CUSTOM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common/host")🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/a5/platform/onboard/host/CMakeLists.txt` around lines 24 - 26, The CMakeLists uses CMAKE_CUSTOM_INCLUDE_DIRS and CMAKE_CURRENT_SOURCE_DIR to append include paths but duplicates "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common" (first and third list(APPEND) calls); remove the redundant third list(APPEND CMAKE_CUSTOM_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common") so the common include is only appended once and leave the "${CMAKE_CURRENT_SOURCE_DIR}/../../../../common/log/include" entry intact.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@docs/dfx/l2-swimlane-profiling.md`:
- Line 362: Several documentation links still point to arch-specific profiling
headers (e.g., the link referencing BufferPoolManager<L2SwimlaneModule>) and
must be retargeted to the consolidated common header location; find the markdown
occurrences that link to architecture-specific include headers (the
BufferPoolManager<L2SwimlaneModule> link and the other similar header links) and
update their URLs to point to the consolidated common platform include directory
(the centralized host profiling headers) so the docs reference the shared header
location instead of the old arch-specific paths.
In `@docs/dfx/pmu-profiling.md`:
- Line 296: Update the stale documentation links that reference arch-specific
host headers so they point to the consolidated common headers; specifically
change the link target for profiling_common::ProfilerBase<PmuCollector,
PmuModule> and the other two links mentioned (the occurrences around lines
referencing the PMU framework) to use the new path prefix
src/common/platform/include/host/... instead of the old arch-specific host
header paths, ensuring each markdown link target is replaced with the
consolidated header location so the docs resolve correctly.
In `@docs/dfx/tensor-dump.md`:
- Line 364: Update the TensorDump framework include links that currently point
to arch-specific host headers to instead use the consolidated common headers;
specifically replace occurrences like ../src/a2a3/platform/include/host/... with
../src/common/platform/include/host/... for the referenced symbols/links such as
BufferPoolManager<DumpModule> and the other TensorDump host-header links in this
document so all four occurrences use src/common/platform/include/host/...
In `@docs/profiling-framework.md`:
- Around line 5-8: Update the paragraph that currently claims per-arch header
copies and uses two identical links so it consistently states that headers are
consolidated under the common host include directory and not duplicated
per-arch; replace the two identical links that point to the common location with
a single clear reference to the consolidated host headers and change every stale
occurrence of the legacy per-arch token (e.g. any 'src/a2a3/' or similar
per-arch paths) at the noted locations to the consolidated
'src/common/platform/include/host/' token, and reword the sentence that mentions
"the two copies are kept byte-for-byte" to reflect a single authoritative copy
so all references and links are consistent.
---
Outside diff comments:
In `@tests/ut/cpp/CMakeLists.txt`:
- Around line 254-259: The CMake include path for device_arena.h is stale:
update occurrences that add
"${CMAKE_SOURCE_DIR}/../../../src/common/device_comm" (seen in targets like
add_common_utils_test, a2a3_rt_objs, a5_rt_objs) to point to
"${CMAKE_SOURCE_DIR}/../../../src/common/utils" so the tests can find
device_arena.h (or alternatively change the test source includes to use
"utils/device_arena.h"); modify the include_directories /
target_include_directories entries that reference device_comm to use the utils
directory instead.
- Around line 315-318: The CMake target test_orch_so_file is referencing a
deleted source path under src/a2a3; update the add_executable source list so
that test_orch_so_file uses the relocated file at
src/common/platform/onboard/aicpu/orch_so_file.cpp (replace the old
${CMAKE_SOURCE_DIR}/../../../src/a2a3/platform/onboard/aicpu/orch_so_file.cpp
entry with the consolidated
${CMAKE_SOURCE_DIR}/../../../src/common/platform/onboard/aicpu/orch_so_file.cpp
path) so CMake can find orch_so_file.cpp when configuring and building.
---
Nitpick comments:
In `@src/a5/platform/onboard/host/CMakeLists.txt`:
- Around line 24-26: The CMakeLists uses CMAKE_CUSTOM_INCLUDE_DIRS and
CMAKE_CURRENT_SOURCE_DIR to append include paths but duplicates
"${CMAKE_CURRENT_SOURCE_DIR}/../../../../common" (first and third list(APPEND)
calls); remove the redundant third list(APPEND CMAKE_CUSTOM_INCLUDE_DIRS
"${CMAKE_CURRENT_SOURCE_DIR}/../../../../common") so the common include is only
appended once and leave the
"${CMAKE_CURRENT_SOURCE_DIR}/../../../../common/log/include" entry intact.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: a49dc42e-8a7b-4661-8534-c74a4b47483f
📒 Files selected for processing (102)
docs/developer-guide.mddocs/dfx/l2-swimlane-profiling.mddocs/dfx/pmu-profiling.mddocs/dfx/scope-stats.mddocs/dfx/tensor-dump.mddocs/hardware/cache-coherency.mddocs/logging.mddocs/profiling-framework.mdsimpler_setup/runtime_compiler.pysimpler_setup/tools/sched_overhead_analysis.pysrc/a2a3/docs/platform.mdsrc/a2a3/platform/docs/tpush-tpop-sim.mdsrc/a2a3/platform/include/aicpu/platform_regs.hsrc/a2a3/platform/include/common/dep_gen.hsrc/a2a3/platform/include/host/dep_gen_collector.hsrc/a2a3/platform/include/host/l2_swimlane_collector.hsrc/a2a3/platform/include/host/pmu_collector.hsrc/a2a3/platform/onboard/aicpu/CMakeLists.txtsrc/a2a3/platform/onboard/aicpu/device_malloc.cppsrc/a2a3/platform/onboard/aicpu/device_time.cppsrc/a2a3/platform/onboard/host/CMakeLists.txtsrc/a2a3/platform/onboard/host/device_runner.hsrc/a2a3/platform/shared/aicpu/dep_gen_collector_aicpu.cppsrc/a2a3/platform/shared/aicpu/l2_swimlane_collector_aicpu.cppsrc/a2a3/platform/shared/aicpu/platform_regs.cppsrc/a2a3/platform/shared/aicpu/pmu_collector_aicpu.cppsrc/a2a3/platform/shared/host/dep_gen_collector.cppsrc/a2a3/platform/shared/host/l2_swimlane_collector.cppsrc/a2a3/platform/shared/host/pmu_collector.cppsrc/a2a3/platform/sim/aicpu/CMakeLists.txtsrc/a2a3/platform/sim/aicpu/device_malloc.cppsrc/a2a3/platform/sim/host/CMakeLists.txtsrc/a2a3/runtime/tensormap_and_ringbuffer/host/runtime_maker.cppsrc/a2a3/runtime/tensormap_and_ringbuffer/runtime/pto_orchestrator.hsrc/a2a3/runtime/tensormap_and_ringbuffer/runtime/pto_runtime2.hsrc/a2a3/runtime/tensormap_and_ringbuffer/runtime/pto_shared_memory.hsrc/a2a3/runtime/tensormap_and_ringbuffer/runtime/pto_tensormap.hsrc/a2a3/runtime/tensormap_and_ringbuffer/runtime/scheduler/pto_scheduler.hsrc/a5/docs/platform.mdsrc/a5/platform/docs/tpush-tpop-sim.mdsrc/a5/platform/include/host/l2_swimlane_collector.hsrc/a5/platform/include/host/pmu_collector.hsrc/a5/platform/onboard/aicpu/CMakeLists.txtsrc/a5/platform/onboard/aicpu/cache_ops.cppsrc/a5/platform/onboard/aicpu/device_log.cppsrc/a5/platform/onboard/aicpu/device_time.cppsrc/a5/platform/onboard/aicpu/orch_so_file.cppsrc/a5/platform/onboard/aicpu/platform_aicpu_affinity.cppsrc/a5/platform/onboard/aicpu/spin_hint.hsrc/a5/platform/onboard/host/CMakeLists.txtsrc/a5/platform/onboard/host/device_runner.hsrc/a5/platform/shared/aicpu/l2_swimlane_collector_aicpu.cppsrc/a5/platform/shared/aicpu/platform_regs.cppsrc/a5/platform/shared/aicpu/pmu_collector_aicpu.cppsrc/a5/platform/shared/host/l2_swimlane_collector.cppsrc/a5/platform/shared/host/pmu_collector.cppsrc/a5/platform/sim/aicpu/CMakeLists.txtsrc/a5/platform/sim/aicpu/device_log.cppsrc/a5/platform/sim/aicpu/device_time.cppsrc/a5/platform/sim/aicpu/orch_so_file.cppsrc/a5/platform/sim/aicpu/platform_aicpu_affinity.cppsrc/a5/platform/sim/aicpu/spin_hint.hsrc/a5/platform/sim/host/CMakeLists.txtsrc/a5/runtime/tensormap_and_ringbuffer/host/runtime_maker.cppsrc/a5/runtime/tensormap_and_ringbuffer/runtime/pto_orchestrator.hsrc/a5/runtime/tensormap_and_ringbuffer/runtime/pto_runtime2.hsrc/a5/runtime/tensormap_and_ringbuffer/runtime/pto_shared_memory.hsrc/a5/runtime/tensormap_and_ringbuffer/runtime/pto_tensormap.hsrc/a5/runtime/tensormap_and_ringbuffer/runtime/scheduler/pto_scheduler.hsrc/common/platform/include/common/scope_stats.hsrc/common/platform/include/host/buffer_pool_manager.hsrc/common/platform/include/host/profiler_base.hsrc/common/platform/include/host/scope_stats_collector.hsrc/common/platform/include/host/tensor_dump_collector.hsrc/common/platform/onboard/aicpu/cache_ops.cppsrc/common/platform/onboard/aicpu/device_log.cppsrc/common/platform/onboard/aicpu/device_malloc.cppsrc/common/platform/onboard/aicpu/device_time.cppsrc/common/platform/onboard/aicpu/orch_so_file.cppsrc/common/platform/onboard/aicpu/platform_aicpu_affinity.cppsrc/common/platform/onboard/aicpu/spin_hint.hsrc/common/platform/onboard/host/device_runner_base.hsrc/common/platform/shared/aicpu/scope_stats_collector_aicpu.cppsrc/common/platform/shared/aicpu/tensor_dump_aicpu.cppsrc/common/platform/shared/aicpu/unified_log_device.cppsrc/common/platform/shared/host/platform_compile_info.cppsrc/common/platform/shared/host/scope_stats_collector.cppsrc/common/platform/shared/host/tensor_dump_collector.cppsrc/common/platform/sim/aicpu/cache_ops.cppsrc/common/platform/sim/aicpu/device_log.cppsrc/common/platform/sim/aicpu/device_malloc.cppsrc/common/platform/sim/aicpu/device_time.cppsrc/common/platform/sim/aicpu/orch_so_file.cppsrc/common/platform/sim/aicpu/platform_aicpu_affinity.cppsrc/common/platform/sim/aicpu/spin_hint.hsrc/common/platform/sim/host/device_runner_base.hsrc/common/platform/sim/sim_context/CMakeLists.txtsrc/common/platform/sim/sim_context/cpu_sim_context.cppsrc/common/platform/sim/sim_context/cpu_sim_context.hsrc/common/utils/device_arena.htests/st/a2a3/tensormap_and_ringbuffer/dfx/pmu/test_pmu.pytests/ut/cpp/CMakeLists.txt
💤 Files with no reviewable changes (14)
- src/a5/platform/sim/aicpu/device_time.cpp
- src/a2a3/platform/sim/aicpu/device_malloc.cpp
- src/a5/platform/onboard/aicpu/cache_ops.cpp
- src/a2a3/platform/onboard/aicpu/device_malloc.cpp
- src/a5/platform/sim/aicpu/orch_so_file.cpp
- src/a5/platform/onboard/aicpu/spin_hint.h
- src/a2a3/platform/onboard/aicpu/device_time.cpp
- src/a5/platform/sim/aicpu/spin_hint.h
- src/a5/platform/onboard/aicpu/device_time.cpp
- src/a5/platform/onboard/aicpu/device_log.cpp
- src/a5/platform/onboard/aicpu/orch_so_file.cpp
- src/a5/platform/onboard/aicpu/platform_aicpu_affinity.cpp
- src/a5/platform/sim/aicpu/device_log.cpp
- src/a5/platform/sim/aicpu/platform_aicpu_affinity.cpp
hw-native-sys-bot
force-pushed
the
src-layout-cleanup
branch
6 times, most recently
from
1a5d943 to
170ec65
Compare
…n, consolidate common/, rename platform/src→shared, merge aicpu_loader) Mechanical post-hw-native-sys#944/hw-native-sys#945/hw-native-sys#948 layout cleanup, motivated by an audit of duplicated and oddly-placed files that the recent unification work left behind. Five orthogonal changes bundled here because each touches the same set of CMakeLists; splitting would mean four more rebuild rounds and four more cmake-include-path edits across the same files. 1. Extract identical aicpu sources to common/platform/{onboard,sim}/aicpu/ ------------------------------------------------------------------------ Seven files per backend (14 total) were byte-identical (or differed only in a one-line @brief arch qualifier) between a2a3 and a5: cache_ops.cpp, device_log.cpp, device_time.cpp, device_malloc.cpp, orch_so_file.cpp, platform_aicpu_affinity.cpp, spin_hint.h Moved a2a3's copy to common/, deleted a5's duplicate, and extended each arch's onboard/aicpu and sim/aicpu CMakeLists COMMON_SOURCES glob to pick them up from common/platform/{onboard,sim}/aicpu/. The device_malloc.cpp arch tag in its @brief was the only real content diff; generalized to "Real Hardware" / "Simulation" without the arch qualifier. Backfilled a copyright header that was missing on device_time.cpp (caught by the check-headers hook). The remaining files in per-arch aicpu/ (kernel.cpp, inner_platform_regs.cpp) have real arch-specific divergence (register addresses, kernel protocols) and stay where they are. 2. Flatten profiling_common/ subdir ------------------------------------ src/common/platform/include/host/profiling_common/{buffer_pool_manager, profiler_base}.h → src/common/platform/include/host/{buffer_pool_manager, profiler_base}.h. Updated 10 #include sites and the 2 header guards. The profiling_common:: C++ namespace stays — file path and namespace don't have to match. 3. Consolidate small src/common subdirs ---------------------------------------- - src/common/device_comm/device_arena.h → src/common/utils/device_arena.h. The file is a generic bump-arena utility, not a comm primitive; the enclosing dir name was misleading. Updated 10 #include sites "device_arena.h" → "utils/device_arena.h" and dropped the common/device_comm entry from 8 CMakeLists (replaced with common since utils/ resolves there). - src/common/sim_context/ → src/common/platform/sim/sim_context/. The dir is sim-only infrastructure (CPU sim context for CANN intrinsic emulation), so it belongs next to the other common/platform/sim/ shared sim infrastructure. Updated: * the dir's own CMakeLists relative path to log/include; * simpler_setup/runtime_compiler.py::compile_sim_context source path; * 4 sim-host CMakeLists references; * a small handful of docs that named the old path. 4. Rename platform/src → platform/shared ------------------------------------------ Per-arch src/{arch}/platform/src/ was confusingly nested inside the top-level src/ directory and read as "src/src" in many paths. Renamed to shared/ across all 3 trees (a2a3, a5, common), matching its actual semantic ("shared between onboard and sim within one arch"). Updated 21 files that referenced the old path: CMakeLists, host headers, docs, one test file, and the src/{arch}/docs/platform.md map. 5. Merge host/load_aicpu_op + aicpu_dispatcher → aicpu_loader/{host,device} --------------------------------------------------------------------------- src/common/host/ held a single file pair (load_aicpu_op.{h,cpp}) — the host-side loader that uploads runtime AICPU SOs to CANN's preinstall path. src/common/aicpu_dispatcher/ held the AICPU-side bootstrap helper the loader actually drives. They are the two halves of one mechanism and the README of aicpu_dispatcher already cross-references the loader. Merged into src/common/aicpu_loader/{host,device}/ with the shared README at the top level. host/ holds load_aicpu_op.{h,cpp}, device/ holds aicpu_dispatcher.{h,cpp}. Updated: * 5 #include sites (4 device_runner.{cpp,h} bare includes plus device_runner_base.h's prefixed include) to the consistent aicpu_loader/host/load_aicpu_op.h form; * 4 CMakeLists source-path entries; * dropped the now-unneeded common/host and common/aicpu_dispatcher explicit include-path entries (common/ is already on the path); * updated the README cross-reference comment in load_aicpu_op.h. Test plan --------- - Build all four libhost_runtime.so (a2a3 onboard/sim, a5 onboard/sim) + libcpu_sim_context.so + aicpu and aicore artifacts: clean. - CI will run the full ST + UT suite. Net: ~37 file renames, ~14 files extracted to common, +0 / -0 behavioral changes (pure layout).
hw-native-sys-bot
force-pushed
the
src-layout-cleanup
branch
from
170ec65 to
719a339
Compare
ChaoWao
approved these changes
Jun 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Post-#944/#945/#948 layout cleanup. Audit of the post-unification tree turned up several rough edges; this PR addresses them in one pass because each change touches the same set of CMakeLists — splitting would mean four more cmake-include-path edit rounds.
Five orthogonal cleanups
1. Extract identical aicpu sources to
common/platform/{onboard,sim}/aicpu/Seven files per backend (14 total) were byte-identical (or differed only in a one-line
@briefarch qualifier) between a2a3 and a5:cache_ops.cppdevice_log.cppdevice_time.cppdevice_malloc.cpp(only diff was(a2a3)vs(a5)in the@brief)orch_so_file.cppplatform_aicpu_affinity.cppspin_hint.hMoved a2a3's copy to
common/, deleted a5's duplicate. Extended each arch'sonboard/aicpuandsim/aicpuCMakeListsCOMMON_SOURCESglob to pick the new dir up. Generalized thedevice_malloc.cpp@briefto "Real Hardware" / "Simulation" without the arch qualifier. Backfilled a missing copyright header ondevice_time.cpp(caught by the check-headers hook on the move).The remaining files in per-arch
aicpu/(kernel.cpp,inner_platform_regs.cpp) have real arch-specific divergence (register addresses, kernel protocols) and stay per-arch.2. Flatten
profiling_common/subdirsrc/common/platform/include/host/profiling_common/{buffer_pool_manager,profiler_base}.h→src/common/platform/include/host/{buffer_pool_manager,profiler_base}.h. Updated 10#includesites and the 2 header guards. Theprofiling_common::C++ namespace stays — file path and namespace don't have to match.3. Consolidate small
src/common/subdirssrc/common/device_comm/device_arena.h→src/common/utils/device_arena.h. The file is a generic bump-arena utility, not a comm primitive; the enclosing dir name was misleading. Updated 10#includesites"device_arena.h"→"utils/device_arena.h"and dropped thecommon/device_commentry from 8 CMakeLists (replaced withcommon, sinceutils/resolves there).src/common/sim_context/→src/common/platform/sim/sim_context/. The dir is sim-only infrastructure (CPU sim context for CANN intrinsic emulation); it belongs next to the othercommon/platform/sim/shared sim infrastructure. Updated the dir's own CMakeLists,simpler_setup/runtime_compiler.py::compile_sim_contextsource path, 4 sim-host CMakeLists references, and a small handful of docs that named the old path.4. Rename
platform/src/→platform/shared/Per-arch
src/{arch}/platform/src/was confusingly nested inside the top-levelsrc/directory and read as "src/src" in many paths. Renamed toshared/across all 3 trees (a2a3, a5, common), matching its actual semantic ("shared between onboard and sim within one arch"). Updated 21 files that referenced the old path: CMakeLists, host headers, docs, one test file, and thesrc/{arch}/docs/platform.mdmap. The developer-guide directory diagram is updated to match.5. Merge
host/load_aicpu_op+aicpu_dispatcher→aicpu_loader/{host,device}/src/common/host/held a single file pair (load_aicpu_op.{h,cpp}) — the host-side loader that uploads the runtime AICPU SO to CANN's preinstall path.src/common/aicpu_dispatcher/held the AICPU-side bootstrap helper the loader drives. They are the two halves of one mechanism and the dispatcher's own README cross-references the loader. Merged intosrc/common/aicpu_loader/{host,device}/with the shared README at the top level:host/load_aicpu_op.{h,cpp}— host sidedevice/aicpu_dispatcher.{h,cpp}— AICPU sideREADME.md— protocol description (covers both halves)Updated 5
#includesites (now all use the consistentaicpu_loader/host/load_aicpu_op.hprefixed form), 4 CMakeLists source-path entries, and dropped the now-unneededcommon/hostandcommon/aicpu_dispatcherexplicit include-path entries.What's NOT changed
common/platform/include/aicore/aicore.h(a single file in its own dir) stays put — its include form"aicore/aicore.h"is consistent with"aicpu/..."and"host/...", and removing the namespacing would force a rename across 10+ files for no real gain.tensor_dump.hpad sizes,platform_regs.hreg addresses,inner_platform_regs.cpp,kernel.cpp,inner_kernel.h) stay per-arch.Test plan
libhost_runtime.so(a2a3 onboard/sim, a5 onboard/sim) +libcpu_sim_context.so+ aicpu and aicore artifacts: clean.Net: ~37 file renames, ~14 files extracted to common, +0 / -0 behavioral changes (pure layout).