From d52f4af2e9631e6075a6395d3ee111853a09bad5 Mon Sep 17 00:00:00 2001
From: Chen Ning <chenning54@huawei.com>
Date: Wed, 15 Oct 2025 18:34:06 +0800
Subject: [PATCH] add new namespace to "AscendC::tiling" to adv tiling api and
 ensure the compatibility

---
 cmake/scripts/gen_kernel_tiling_data_def.py | 56 +++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/cmake/scripts/gen_kernel_tiling_data_def.py b/cmake/scripts/gen_kernel_tiling_data_def.py
index 22394286..c8e08618 100644
--- a/cmake/scripts/gen_kernel_tiling_data_def.py
+++ b/cmake/scripts/gen_kernel_tiling_data_def.py
@@ -15,13 +15,52 @@ import os
 import re
 
 
+_NAMESPACE = "AscendC::tiling"
+_LEGACY_TILING_STRUCTS = [
+    "LogSoftMaxTiling",
+    "SoftMaxTiling",
+    "TConv3DApiTiling",
+    "TConv3DBpFilterTiling",
+    "Conv3DBpFilterParams",
+    "TConv3DBpFilterBasicBlockTiling",
+    "Conv3DBackpropFilterTilingData",
+    "TConv3DBackpropInputTiling",
+    "Conv3DBackpropInputTilingData",
+    "Mc2ServerCfg",
+    "Mc2HcommCfg",
+    "Mc2InitTiling",
+    "Mc2CcTiling",
+    "TCubeTiling",
+    "BatchNormTiling",
+    "DeepNormTiling",
+    "GroupNormTiling",
+    "LayerNormGradBetaTiling",
+    "LayerNormGradTiling",
+    "LayerNormTiling",
+    "LayerNormSeparateTiling",
+    "RmsNormTiling",
+    "UnPadTiling",
+    "PadTiling",
+    "TopkTiling",
+    "ConfusionTransposeTiling"
+]
+
+
 def gen_tiling(tiling_header_file):
     single_tiling_source = ""
+    single_legacy_tiling_export = ""
     if not os.path.exists(tiling_header_file):
         print("warning: no userdef tiling header file: ", tiling_header_file)
         return single_tiling_source
     print("generate tiling def header file: ", tiling_header_file)
     pattern = re.compile(r'[(](.*)[)]', re.S)
+
+    def parse_legacy_tiling(struct_def):
+        # export legacy tiling structs with 'using namespace' to ensure compatibility
+        nonlocal single_legacy_tiling_export
+        if struct_def in _LEGACY_TILING_STRUCTS:
+            single_legacy_tiling_export += f"using {_NAMESPACE}::{struct_def};\n"
+
     with open(tiling_header_file, 'r') as fd:
         lines = fd.readlines()
         for line in lines:
@@ -29,8 +68,9 @@ def gen_tiling(tiling_header_file):
             if (line.startswith('BEGIN_TILING_DATA_DEF')):
                 single_tiling_source += '#pragma pack(push, 8)\n'
                 single_tiling_source += 'struct '
-                struct_def  = re.findall(pattern, line)[0]
+                struct_def = re.findall(pattern, line)[0]
                 single_tiling_source += struct_def + ' {\n'
+                parse_legacy_tiling(struct_def)
             elif (line.startswith('TILING_DATA_FIELD_DEF_ARR')):
                 field_params = re.findall(pattern, line)[0]
                 fds = field_params.split(',')
@@ -46,7 +86,7 @@ def gen_tiling(tiling_header_file):
             elif (line.startswith('END_TILING_DATA_DEF')):
                 single_tiling_source += '};\n'
                 single_tiling_source += '#pragma pack(pop)\n'
-    return single_tiling_source
+    return single_tiling_source, single_legacy_tiling_export
 
 
 
@@ -62,6 +102,7 @@ if __name__ == '__main__':
 #endif
 
 """
+    res += "namespace AscendC {\nnamespace tiling {\n"
     print("[LOG]:  ", sys.argv[1], sys.argv[2], sys.argv[3])
     src_tiling_data_path = sys.argv[1]
     file_list = []
@@ -79,8 +120,17 @@ if __name__ == '__main__':
             if file.endswith("tilingdata.h") and file not in file_set:
                 file_list.append(os.path.join(root, file))
     file_list.sort()
+    
+    tiling_source = ""
+    legacy_tiling_export = ""
     for file in file_list:
-        res += gen_tiling(file)
+        src, exp = gen_tiling(file)
+        tiling_source += src
+        legacy_tiling_export += exp
+
+    res += tiling_source + "} // namespace tiling\n} // namespace AscendC\n\n"
+    res += legacy_tiling_export
+
     res += '#endif\n'
 
     generate_file = sys.argv[3]
-- 
Gitee