From d2c328e8c1808a02b7f2bef525d9d95e4b735127 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 10:44:42 +0800 Subject: [PATCH] =?UTF-8?q?chore(mem):=20=E6=8C=89=20master=20=E6=9D=83?= =?UTF-8?q?=E5=A8=81=E6=9E=84=E5=BB=BA=E5=9B=9E=E5=A1=AB=E5=86=85=E5=AD=98?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并后的首次权威构建:0 Error(s), 0 Warning(s),Program Size Code=365924 RO-data=48336 RW-data=2736 ZI-data=173104。 相对合并前 master 基线(Code=365896 / RO=48336 / RW=2736 / ZI=173104): Code +28 B,其余三项全零。与任务树内测得的 +28 B 一致——同一处改动在 两棵树上的增量相同,说明 104 目录重构没有改变这部分代码体积。 IRAM1 仍是 118,416 B(90.3%),距 92% 阈值剩 2,170 B。+0 的原因是 sys_clock.o 新增的 s_prev_lo/s_hi(8 B)与 net_socket.o 删掉的同名两个 static(8 B)精确抵消。 三道内存门禁均通过:ram_baseline --gate PASS、check_mem_numbers --check 「内存数字一致」、check_size_gate --local「同码 ✓ 受管区 <=92% ✓」。 --- docs/内存管理/RAM使用分析与优化方案.md | 4 ++-- docs/内存管理/RAM预算台账.md | 6 +++--- scripts/ram_baseline.tsv | 1 + scripts/size_attestation.json | 16 ++++++++-------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docs/内存管理/RAM使用分析与优化方案.md b/docs/内存管理/RAM使用分析与优化方案.md index 8ff51e10..9f37436a 100644 --- a/docs/内存管理/RAM使用分析与优化方案.md +++ b/docs/内存管理/RAM使用分析与优化方案.md @@ -47,10 +47,10 @@ dhara 失败类 +84;RO 另 +208,全是该失败类名表)→ `ER_IROM1` | 区域 | 用量 | 容量 | 占比 | |---|---|---|---| -| ER_IROM1 | 414,232 B (404.52 KB) | 1,048,576 B (1024 KB) | 39.5% | +| ER_IROM1 | 414,260 B (404.55 KB) | 1,048,576 B (1024 KB) | 39.5% | | RW_IRAM1 | 118,416 B (115.64 KB) | 131,072 B (128 KB) | 90.3% | | RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% | -| **Flash (ROM 合计)** | **416,968 B (407.2 KB)** | 1,048,576 B (1024 KB) | **39.8%** | +| **Flash (ROM 合计)** | **416,996 B (407.2 KB)** | 1,048,576 B (1024 KB) | **39.8%** | 各区的容量与常量来源: diff --git a/docs/内存管理/RAM预算台账.md b/docs/内存管理/RAM预算台账.md index 61ae3f85..777b1505 100644 --- a/docs/内存管理/RAM预算台账.md +++ b/docs/内存管理/RAM预算台账.md @@ -15,18 +15,18 @@ | 区域 | 用量 | 容量 | 占比 | 门禁(≤92%) | |---|---|---|---|---| -| ER_IROM1 (Flash) | 414,232 B | 1,048,576 B | 39.5% | 参考 | +| ER_IROM1 (Flash) | 414,260 B | 1,048,576 B | 39.5% | 参考 | | RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS | | UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 | | RW_IRAM1 | 118,416 B | 131,072 B | 90.3% | PASS | | 子系统(静态 RW+ZI;除 RTOS 堆在 CCM 外均在 SRAM1) | 现值 | 配额 | 状态 | |---|---|---|---| -| 网络 | 13,966 B | 12 KB | ⚠ 超 1.6 KB | +| 网络 | 13,958 B | 12 KB | ⚠ 超 1.6 KB | | 存储 | 9,144 B | 12 KB | OK | | UI | 36,791 B | 16 KB | ⚠ 超 19.9 KB | | RTOS 堆 | 57,376 B | 56 KB | 堆=配额 | -| 应用 | 47,699 B | 8 KB | ⚠ 超 38.6 KB | +| 应用 | 47,707 B | 8 KB | ⚠ 超 38.6 KB | | 其它 | 10,797 B | — | 参考 | diff --git a/scripts/ram_baseline.tsv b/scripts/ram_baseline.tsv index b5135757..3df88258 100644 --- a/scripts/ram_baseline.tsv +++ b/scripts/ram_baseline.tsv @@ -24,3 +24,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi 2026-11-13 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-15 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-18 365896 48336 2736 173104 414232 39.5 118416 90.3 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7656;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 +2026-11-19 365924 48336 2736 173104 414260 39.5 118416 90.3 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7656;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 diff --git a/scripts/size_attestation.json b/scripts/size_attestation.json index c3ae39e5..2e3fa0da 100644 --- a/scripts/size_attestation.json +++ b/scripts/size_attestation.json @@ -1,17 +1,17 @@ { - "built_at": "2026-11-18T22:22:18+08:00", - "fingerprint": "256d83d9b538cf07128939875d5be8c19b63937dbb183d69d3228d8dbcf2e5c9", - "fingerprint_files": 1564, + "built_at": "2026-11-19T10:44:05+08:00", + "fingerprint": "b5fe5759eaf4a4b13edd5a6042aff84d16a7734170d14b689e2e58e761a83379", + "fingerprint_files": 1563, "fingerprint_source": "git-index", "gated_regions": [ "RW_IRAM1", "RW_CCM" ], - "git_head": "be18b81e82ad300c9132ec48781eac40e7b42402", + "git_head": "b142ca5531b7f791ec4bc489a460cf86bffd3bdd", "map": "MDK-ARM/STM32F407-Demo/STM32F407-Demo.map", - "map_mtime": 1795011694, + "map_mtime": 1795056226, "pct": { - "ER_IROM1": 39.5, + "ER_IROM1": 39.51, "RW_CCM": 87.89, "RW_IRAM1": 90.34, "UNINIT_CCM": 18.75 @@ -19,7 +19,7 @@ "regions": { "ER_IROM1": { "max": 1048576, - "size": 414232 + "size": 414260 }, "RW_CCM": { "max": 65280, @@ -37,7 +37,7 @@ "schema": 2, "scope_note": "\u540c\u7801\u51ed\u8bc1\uff1a\u6307\u7eb9\u8986\u76d6\u56fa\u4ef6\u4f53\u79ef\u76f8\u5173\u6e90\u7801\uff0c\u53e3\u5f84\u89c1\u672c\u811a\u672c docstring", "sizes": { - "code": 365896, + "code": 365924, "ro_data": 48336, "rw_data": 2736, "zi_data": 173104