Merged
fix: resolve coding standard findings in norm operators #12931
fix: resolve coding standard findings in norm operators #12931
Merged
rkAdd on 25 days ago
rk
rkCollaborators
25 days ago

描述

对 norm 系算子(add_rms_norm_hi_f4_quant、rms_norm_hi_f4_quant、batch_norm_grad_v3、rms_norm_dynamic_mx_quant)的编码规范问题进行整改,无功能逻辑变更。

改动原因

编码规范检查发现以下问题:

  1. kernel/tiling 代码中存在魔法数字(裸 2、16、8、32 及硬编码 sysRegLen_ = 256 等);
  2. lambda 使用 [&] 隐式捕获,不符合显式捕获要求;
  3. GetCompileInfo() 返回值转换使用 reinterpret_cast,应使用更安全的 static_cast。

改动方法

  1. 魔法数字具名化:
    • add_rms_norm_hi_f4_quant / rms_norm_hi_f4_quant(arch92,两算子对称整改):新增具名常量 HIF4_MAX_PER4_ELEMENTS_PER_GROUP(16)、HIF4_MAX_PER8_ELEMENTS_PER_GROUP(8)、HIF4_TMP_SCALE_ELEMENTS_PER_GROUP(32)、HIF4_DEINTERLEAVE_REGISTERS_PER_LOAD(2) 替代 InitBuffer 中的裸数字;sysRegLen_ = 256 硬编码改为 VECTOR_LENGTH(由 platform::GetVRegSize() 派生);scaleRank - 2 改为 scaleRank - NUM_TWO。
    • batch_norm_grad_v3:k / 2、copies *= 2、rows /= 2 等裸 2 改用 TWO 常量;rowsPerGroup_ 增长因子、终止行数改用具名常量(PACKED_GROUP_GROWTH_FACTOR、FINAL_REDUCTION_ROWS)。
  2. lambda 显式捕获:batch_norm_grad_v3_tiling_infer.cpp 的 ubUsed 与 rms_norm_dynamic_mx_quant_full_load_tiling.cpp 的 getUbSize 由 [&] 隐式捕获改为显式捕获列表。
  3. 类型转换规范:两处 GetCompileInfo() 的 reinterpret_cast 改为 static_cast。
  4. 日志长参数换行等格式调整,删除多余空行。

涉及文件(14 个,+60 -45):

  • norm/add_rms_norm_hi_f4_quant/op_host/op_tiling/arch92/add_rms_norm_hi_f4_quant_tiling_base.cpp(+5 -5)
  • norm/add_rms_norm_hi_f4_quant/op_kernel/arch92/add_rms_norm_hi_f4_quant_common.h(+7 -1)
  • norm/add_rms_norm_hi_f4_quant/op_kernel/arch92/add_rms_norm_hi_f4_quant_hif4_r_full_load.h(+6 -6)
  • norm/add_rms_norm_hi_f4_quant/op_kernel/arch92/add_rms_norm_hi_f4_quant_hif4_split_d.h(+6 -6)
  • norm/rms_norm_hi_f4_quant/ 对称 4 个文件(同模式整改)
  • norm/batch_norm_grad_v3/op_host/batch_norm_grad_v3_tiling_infer.cpp(+1 -1)
  • norm/batch_norm_grad_v3/op_host/batch_norm_grad_v3_tiling_ra_split_r.cpp(+3 -2)
  • norm/batch_norm_grad_v3/op_kernel/arch35/ 3 个 kernel 文件
  • norm/rms_norm_dynamic_mx_quant/op_host/arch35/rms_norm_dynamic_mx_quant_full_load_tiling.cpp(+2 -1)

关联的Issue

-https://gitcode.com/cann/ops-nn/issues/7767

测试

编码规范整改,不涉及功能逻辑变更,无需测试。

文档更新

不涉及

类型标签

AI/Agent生成声明

likedislike
Pull Request has been successfully merged by CANN-robot.
(Thank you for rk's contribution.)
rkrkCollaborators
25 days ago Created pull request, commit dfd7bd5d
atomgit-bot
atomgit-bot
25 days ago Comments:

变更摘要

本 PR 针对 norm 目录下的算子实施编码规范整改,核心目标是把硬编码的魔法数字替换为具名常量、为 lambda 补充显式捕获列表,并用更安全的类型转换替代 reinterpret_cast。改动覆盖 add_rms_norm_hi_f4_quant、rms_norm_hi_f4_quant、batch_norm_grad_v3、rms_norm_dynamic_mx_quant 等算子的 tiling 与 kernel 代码,整体不改变算子对外接口与业务行为,属于可读性与规范一致性维护。

主要改动

  • HiF4 量化公共常量集中定义: 在 add_rms_norm_hi_f4_quant_common.h 与 rms_norm_hi_f4_quant_common.h 中新增 HIF4_MAX_PER4_ELEMENTS_PER_GROUP、HIF4_MAX_PER8_ELEMENTS_PER_GROUP、HIF4_TMP_SCALE_ELEMENTS_PER_GROUP、HIF4_DEINTERLEAVE_REGISTERS_PER_LOAD 以及 VREG_SIZE_BYTES,供多个 kernel 文件共享。
  • kernel 缓冲区与寄存器步长改用常量: hif4_r_full_load.h 和 hif4_split_d.h 中的 InitBuffer 分组元素数由 16/8/32 改为具名常量,sysRegLen_ 由硬编码 256 改为 VREG_SIZE_BYTES,gmCopyInRegStep_ 中的乘数 2 改为 HIF4_DEINTERLEAVE_REGISTERS_PER_LOAD。
  • tiling 校验与平台信息获取规范化: 两个 HiF4 tiling base 文件在 CheckOutputShapeValue 中引入 SCALE_BLOCK_DIM_OFFSET_FROM_END 与 scaleBlockDimIndex 统一索引计算,GetPlatformInfo 将 reinterpret_cast 改为 static_cast,并清理多余空行。
  • batch_norm_grad_v3 与 rms_norm_dynamic_mx_quant 的 lambda 捕获与常量替换: batch_norm_grad_v3_tiling_infer.cpp 和 rms_norm_dynamic_mx_quant_full_load_tiling.cpp 的 ubUsed、getUbSize 由隐式捕获改为显式捕获依赖变量;batch_norm_grad_v3 相关 host/kernel 文件将分组增长因子与折半基数等字面量替换为 PACKED_GROUP_GROWTH_FACTOR、FINAL_REDUCTION_ROWS、TWO。

(注:本次仅做只读分析,未执行任何仓库操作。)


🧩 本次 Review 已使用自定义 Skill:

likedislike
Incorrect?
atomgit-bot
atomgit-bot
25 days ago Comments:

代码审查

✅ 未发现问题


🧩 本次 Review 已使用自定义 Skill:

likedislike
Incorrect?
CANN-robotCANN-robotCollaborators
25 days ago Added label: cann-cla/yes
CANN-robot
CANN-robotCollaborators
25 days ago Comments:

Thanks for your pull-request.
The full list of commands accepted by me can be found at here.
You can get sig-info at here.
You can self-configure the PR merge rules for this repository. For more details, please refer to Here.
For more, you also can visit HICANN.


PR Approval Progress

✅ Congratulations! All modules have met the lgtm and approve requirements.

Module Approval Details

module lgtm status approve status
norm ✅ 唐超, 钱泽洪 (2/2) ✅ 钱泽洪 (1/1)

💡 Tip:

  • Committer can comment /approve or /lgtm
  • Commenting /approve implies both code review (lgtm) and intent to merge (approve)

CLA Signature Pass

wangpengbo26, thanks for your pull request. All authors of the commits have signed the CLA. 👍

likedislike
CANN-robot
CANN-robotCollaborators
25 days ago Comments:

CLA Signature Pass

wangpengbo26, thanks for your pull request. All authors of the commits have signed the CLA. 👍

likedislike
CANN-robotCANN-robotCollaborators
25 days ago Set zengjuan,u010470851,chaotang233,kevin_huang1234,crystalhu,yangyang016,fanqirui,wangrui_,renruhai,su-yueming,zhajianqing123,yourealize,chenqi317,wang-xing001,liubo75,tangweiwei2,chenxingyu18,liujie12345678,east_yang,pingchuantang,Chen_HaoWen,qianzehong as approver
22 event messages are collapsed here。 See more
CANN-robotCANN-robotCollaborators
23 days ago Added label: cann-cla/yes
rk
rkCollaborators
23 days ago Comments:

compile

likedislike
rkrkCollaborators
23 days ago Pre merge succeeded (commit_id: ce53fc2fc5ecbaf96081c5e8b8c18b198ef935dd)
rkrkCollaborators
23 days ago Modify description of pull request
CANN-robot
CANN-robotCollaborators
23 days ago Comments:
🚀 CI 流水线已启动
📋 执行详情: 点击查看流水线
likedislike
CANN-robotCANN-robotCollaborators
23 days ago Added label: ci-pipeline-running
CANN-robotCANN-robotCollaborators
23 days ago Removed label: ci-pipeline-running
CANN-robotCANN-robotCollaborators
23 days ago Added label: ci-pipeline-passed
yuning_chen
yuning_chenCollaborators
23 days ago Comments:

您好,pr合入已准备就绪,请尽快联系committer进行检视,谢谢!
@renruhai @east_yang @fanqirui @yourealize @wang-xing001 @wangrui_ @su-yueming @pingchuantang

likedislike
qianzehong
qianzehongCollaborators
23 days ago Comments:

/lgtm
/approve

likedislike
CANN-robotCANN-robotCollaborators
23 days ago Added label: approved
唐超唐超Collaborators
22 days ago Approval passed
唐超
唐超Collaborators
22 days ago Comments:

/lgtm
/approve

likedislike
CANN-robot
CANN-robotCollaborators
22 days ago Comments:

The following users do not have permission to comment /lgtm or /approve on any module in this PR:
/approve: 唐超

likedislike
CANN-robotCANN-robotCollaborators
22 days ago Added label: lgtm
CANN-robotCANN-robotCollaborators
22 days ago Closed associated issue
CANN-robotCANN-robotCollaborators
22 days ago Merged pull request