perf(iec104): 删死仿真数组并按类型分表存变化检测基线,省 816 B RAM

104 的内存大头不在协议栈本身,而在两处「每层各留一份、且按最宽类型统一
存储」的静态数组。本次按实测逐项瘦身,行为等价有证:

一、iec104_source.c 删掉 5 个无写者的模拟注入数组(ZI -288 B)
   singles / single_set / doubles / measurements / measurement_set 的唯一
   写入点是 init() 的 memset,全仓无 setter、无导出写 API、simulator 与
   test 也无人写。故 single_set/measurement_set 恒 0 使对应 if 分支永假、
   doubles 恒 0 使 type3 分支恒返回零值+NO_SOURCE_QUALITY。
   保留 steps/bits:iec104_source_find() 用它们响应 IOA 0x1201..0x1208 与
   0x1301..0x1308,删掉会把「返回 0+品质」变成「未知地址」,属协议行为变化。
   实测 ZI 5912 -> 5624,比数组名义总和 284 多 4 B,因两处 2 字节对齐空隙
   一并消失。

二、iec104_core.c 变化检测基线按点类型分表(ZI -528 B)
   原 core_previous_t previous[105] 每点 8 字节(uint32 value + quality +
   bool,对齐补到 8),840 B。改为按点表顺序分三段:单点 u8 x59、双点
   u8 x16、测量值 u32 x30,品质按原索引逐点存,initialized 改位图 14 B。
   测量值仍按 32 位位模式比较,不是浮点比较,NaN/-0 判等语义不变。
   加两道防护:编译期断言「SP+DP+ME == 105 且段边界为 0/59/75」;启动期
   逐点校验 type_id 必须依次为 1/3/13,错序即启动失败——否则会静默把一种
   类型的值当另一种比较。校验在每次 core_start 跑 105 次,刻意不缓存成
   静态标志:重连后点表若被改坏,这一次就是唯一防线。

等价性证据(独立审查员复算,非自述):
  iec104_source_point() 225 点全表 x 回调三态 x 边界 4089 条轨迹逐字节一致;
  变化检测 133,560 次判定/读回零差异;4 个位置的变异体各自红在埋点行,
  证明这几条判据不是恒真摆设;去掉启动校验后乱序点表在主机用例里静默通过。

实测(权威构建,同一台机器前后对比):
  RW_IRAM1   118,120 -> 117,304 B(-816,90.1% -> 89.5%)
  ER_IROM1   413,416 -> 413,392 B(-24)
  iec104_source.o ZI 5912 -> 5624;iec104_core.o ZI 3192 -> 2664
  s_core 2928 -> 2400 B

顺带把 App/task/iec104_serv.c 两处写死的源码行号改为「文件路径+函数名」
锚点,重构后不会漂移。
This commit is contained in:
2026-11-19 12:51:45 +08:00
parent f23d30111d
commit ed25fc5a4d
7 changed files with 97 additions and 49 deletions
+1 -1
View File
@@ -24,4 +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 365080 48336 2736 172808 413416 39.4 118120 90.1 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376
2026-11-19 365056 48336 2736 171992 413392 39.4 117304 89.5 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5656;wave_ring.o=5332;sb_link.o=4376
1 date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi
24 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
25 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
26 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
27 2026-11-19 365080 365056 48336 2736 172808 171992 413416 413392 39.4 118120 117304 90.1 89.5 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5944;wave_ring.o=5332;sb_link.o=4376 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;iec104_tcpserver.o=7360;ui_net_sink.o=6802;ui_port.o=6432;iec104_source.o=5656;wave_ring.o=5332;sb_link.o=4376
+11 -11
View File
@@ -1,25 +1,25 @@
{
"built_at": "2026-11-18T22:22:18+08:00",
"fingerprint": "256d83d9b538cf07128939875d5be8c19b63937dbb183d69d3228d8dbcf2e5c9",
"fingerprint_files": 1564,
"built_at": "2026-11-19T12:39:05+08:00",
"fingerprint": "3cf7eb47ff97d4e8bca135c8bd81d0b47f6824b8bf42541108b0b0d3c9ade85a",
"fingerprint_files": 1563,
"fingerprint_source": "git-index",
"gated_regions": [
"RW_IRAM1",
"RW_CCM"
],
"git_head": "be18b81e82ad300c9132ec48781eac40e7b42402",
"git_head": "f23d30111d3201cbccdef2b42866015e5fb10033",
"map": "MDK-ARM/STM32F407-Demo/STM32F407-Demo.map",
"map_mtime": 1795011694,
"map_mtime": 1795062995,
"pct": {
"ER_IROM1": 39.5,
"ER_IROM1": 39.42,
"RW_CCM": 87.89,
"RW_IRAM1": 90.34,
"RW_IRAM1": 89.5,
"UNINIT_CCM": 18.75
},
"regions": {
"ER_IROM1": {
"max": 1048576,
"size": 414232
"size": 413392
},
"RW_CCM": {
"max": 65280,
@@ -27,7 +27,7 @@
},
"RW_IRAM1": {
"max": 131072,
"size": 118416
"size": 117304
},
"UNINIT_CCM": {
"max": 256,
@@ -37,10 +37,10 @@
"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": 365056,
"ro_data": 48336,
"rw_data": 2736,
"zi_data": 173104
"zi_data": 171992
},
"threshold_pct": 92.0,
"worktree_dirt_at_stamp": 0,