perf(chip): 单核 WCH 口 MAX_HARTS 取 1——READYQ 静态从 4K 缩到 256B - #20
Merged
Merged
Conversation
问题:`READYQ = [[TaskQueue; 16]; MAX_HARTS]`,而 `MAX_HARTS` 恒为 16 → **单核口**也静态占 `16 × 16 × 16B = 4096B`(实测符号 `READYQ = 0x1000`)。CH572 只有 12K RAM,这一项等于 **三分之一的 RAM**,直接挤掉了应用可用的堆。 改法:`MAX_HARTS` 移进 `src/chip/env.rs` 按芯片取值——单核 WCH 口(ch583/ch572)取 **1**, 其余口(含多核的 qemu_riscv)保持 16;`src/port.rs` 改为 re-export,既有 `crate::port::MAX_HARTS` 的引用路径不变(全部调用点沿用 `.min(MAX_HARTS-1)` 的既有守卫)。 ## 效果(实测符号/段地址) | 口 | READYQ | `_sheap` | 可用堆 | |---|---|---|---| | ch572 | 0x1000 → **0x100** | 0x20001180 → **0x200001B0** | 7.6K → **11.6K** | | ch583 | 0x1000 → 0x100 | 前移 3.8K | 同步 +3.8K | 由此把 ch572 示例从"3 个 192 字栈任务 + 5.5K 堆"那种 12K 下的妥协,恢复成 **5 个任务用内核默认 256 字栈(1K)+ Queue 演示 + 9.5K 堆**——实测账: 5×1.19K + 软件定时器 1.16K + idle 1.16K ≈ 8.3K,余量 ~1.4K(堆顶 0x200027B0, 距中断栈基 0x20002E00 还有 ~1.6K)。 ## 验证 - `bash ci/gate.sh` 全绿:host 159 / ISR 向量 / 启动头 ×3 / 乒乓 A×200 B×200 / kernel_tests 24-24 ×3 / **qemu_smp 9/9**——最后一项专门证明多核口未受影响 (`MAX_HARTS` 在 qemu_riscv 仍是 16)。 - 14 口 `cargo build --lib` 全绿;ch583/ch572 示例构建 + 启动头产物校验 PASS;宿主 82 passed。 Refs #14
2 of 7 tasks
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
1 participant
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.
问题:
READYQ = [[TaskQueue; 16]; MAX_HARTS],而MAX_HARTS恒为 16 → 单核口也静态占16 × 16 × 16B = 4096B(实测符号READYQ = 0x1000)。CH572 只有 12K RAM,这一项等于三分之一的 RAM,直接挤掉了应用可用的堆。
改法:
MAX_HARTS移进src/chip/env.rs按芯片取值——单核 WCH 口(ch583/ch572)取 1,其余口(含多核的 qemu_riscv)保持 16;
src/port.rs改为 re-export,既有crate::port::MAX_HARTS的引用路径不变(全部调用点沿用.min(MAX_HARTS-1)的既有守卫)。效果(实测符号/段地址)
_sheap由此把 ch572 示例从"3 个 192 字栈任务 + 5.5K 堆"那种 12K 下的妥协,恢复成
5 个任务用内核默认 256 字栈(1K)+ Queue 演示 + 9.5K 堆——实测账:
5×1.19K + 软件定时器 1.16K + idle 1.16K ≈ 8.3K,余量 ~1.4K(堆顶 0x200027B0,
距中断栈基 0x20002E00 还有 ~1.6K)。
验证
bash ci/gate.sh全绿:host 159 / ISR 向量 / 启动头 ×3 / 乒乓 A×200 B×200 /kernel_tests 24-24 ×3 / qemu_smp 9/9——最后一项专门证明多核口未受影响
(
MAX_HARTS在 qemu_riscv 仍是 16)。cargo build --lib全绿;ch583/ch572 示例构建 + 启动头产物校验 PASS;宿主 82 passed。Refs #14