Update tests to pass in func call link through aircc

Xilinx · Feb 24, 2025 · 122c14c · 122c14c
1 parent f4fe32b
commit 122c14c
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 21 deletions.
diff --git a/test/xrt/07_extern_linalg/gen.py b/test/xrt/07_extern_linalg/gen.py
@@ -74,7 +74,6 @@ def add(lhs, rhs, out):
     + ",".join(
         [
             "func.func(air-lower-herd-parallel)",
-            "air-linalg-to-func",
         ]
     )
     + ")"
@@ -86,5 +85,7 @@ def add(lhs, rhs, out):
 # Run compile and load
 ###############################################
 
-backend = XRTBackend()
+backend = XRTBackend(
+    lower_linalg_to_func="kernel.o",
+)
 module_function = backend.compile_and_load(module)
diff --git a/test/xrt/12_matmul_transform_1x4_bf16/gen.py b/test/xrt/12_matmul_transform_1x4_bf16/gen.py
@@ -116,7 +116,6 @@ def forward(lhs, rhs, out):
     + ",".join(
         [
             "air-copy-to-dma",
-            "air-linalg-to-func{link-with=kernel.o}",
             "air-par-to-herd{depth=-1}",
             "air-par-to-launch{has-air-segment=1}",
             "scf-forall-to-for",
@@ -137,6 +136,6 @@ def forward(lhs, rhs, out):
 backend = XRTBackend(
     air_loop_fusion=True,
     runtime_loop_tiling_sizes=[1, 1],
-    lower_linalg_to_func=True,
+    lower_linalg_to_func="kernel.o",
 )
-module_function = backend.compile_and_load(air_module)
+module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/15_gemm_peeling_extern_vec_4x4_bf16/gen.py b/test/xrt/15_gemm_peeling_extern_vec_4x4_bf16/gen.py
@@ -141,7 +141,6 @@
         + ",".join(
             [
                 "buffer-results-to-out-params",
-                "air-linalg-to-func{link-with=mm.o}",
                 "air-par-to-herd{depth=-1}",
                 "air-par-to-launch{has-air-segment=true}",
                 "scf-forall-to-for",
@@ -161,6 +160,6 @@
 
     backend = XRTBackend(
         air_loop_fusion=True,
-        lower_linalg_to_func=True,
+        lower_linalg_to_func="mm.o",
     )
     module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/16_gemm_peeling_extern_vec_4x4_bf16_packet/gen.py b/test/xrt/16_gemm_peeling_extern_vec_4x4_bf16_packet/gen.py
@@ -141,7 +141,6 @@
         + ",".join(
             [
                 "buffer-results-to-out-params",
-                "air-linalg-to-func{link-with=mm.o}",
                 "air-par-to-herd{depth=-1}",
                 "air-par-to-launch{has-air-segment=true}",
                 "scf-forall-to-for",
@@ -161,6 +160,6 @@
 
 backend = XRTBackend(
     air_loop_fusion=True,
-    lower_linalg_to_func=True,
+    lower_linalg_to_func="mm.o",
 )
 module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/17_gemm_8x16_transform_vec_4x4/gen.py b/test/xrt/17_gemm_8x16_transform_vec_4x4/gen.py
@@ -119,7 +119,6 @@
         [
             "air-copy-to-dma",
             "buffer-results-to-out-params",
-            "air-linalg-to-func{link-with=mm.o}",
             "air-par-to-herd{depth=-1}",
             "air-par-to-launch{has-air-segment=true}",
             "scf-forall-to-for",
@@ -138,7 +137,7 @@
 
 backend = XRTBackend(
     air_loop_fusion=True,
-    lower_linalg_to_func=True,
+    lower_linalg_to_func="mm.o",
     runtime_loop_tiling_sizes=[1, 1],
 )
 module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/18_matmul_8x16_shim_transform_bf16/gen.py b/test/xrt/18_matmul_8x16_shim_transform_bf16/gen.py
@@ -94,7 +94,6 @@
     + ",".join(
         [
             "air-copy-to-dma",
-            "air-linalg-to-func{link-with=kernel.o}",
             "air-par-to-herd{depth=-1}",
             "air-par-to-launch{has-air-segment=1}",
             "scf-forall-to-for",
@@ -114,7 +113,7 @@
 
 backend = XRTBackend(
     air_loop_fusion=True,
-    lower_linalg_to_func=True,
+    lower_linalg_to_func="kernel.o",
     runtime_loop_tiling_sizes=[2, 2],
 )
 module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/25_batch_matmul_bf16/gen.py b/test/xrt/25_batch_matmul_bf16/gen.py
@@ -141,7 +141,6 @@
         + ",".join(
             [
                 "buffer-results-to-out-params",
-                "air-linalg-to-func{link-with=mm.o}",
                 "air-par-to-herd{depth=-1}",
                 "air-par-to-launch{has-air-segment=true}",
                 "scf-forall-to-for",
@@ -160,7 +159,7 @@
     ###############################################
 
     backend = XRTBackend(
-        lower_linalg_to_func=True,
+        lower_linalg_to_func="mm.o",
         air_loop_fusion=True,
         runtime_loop_tiling_sizes=[1, 1],
     )

diff --git a/test/xrt/26_vecmat_i8/gen.py b/test/xrt/26_vecmat_i8/gen.py
@@ -103,7 +103,6 @@
         + ",".join(
             [
                 "buffer-results-to-out-params",
-                "air-linalg-to-func{link-with=vm.o}",
                 "air-par-to-herd{depth=-1}",
                 "air-par-to-launch{has-air-segment=true}",
                 "scf-forall-to-for",
@@ -122,7 +121,7 @@
     ###############################################
 
     backend = XRTBackend(
-        lower_linalg_to_func=True,
+        lower_linalg_to_func="vm.o",
         air_loop_fusion=True,
     )
     module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/28_gemm_loop_nest_bf16/gen.py b/test/xrt/28_gemm_loop_nest_bf16/gen.py
@@ -103,7 +103,6 @@
         + ",".join(
             [
                 "buffer-results-to-out-params",
-                "air-linalg-to-func{link-with=mm.o}",
                 "air-par-to-herd{depth=-1}",
                 "air-par-to-launch{has-air-segment=true}",
                 "scf-forall-to-for",
@@ -123,6 +122,6 @@
 
     backend = XRTBackend(
         omit_pingpong=True,
-        lower_linalg_to_func=True,
+        lower_linalg_to_func="mm.o",
     )
     module_function = backend.compile_and_load(air_module)
diff --git a/test/xrt/29_gemm_4_level_tiling_extern_vec_4x4_bf16/gen.py b/test/xrt/29_gemm_4_level_tiling_extern_vec_4x4_bf16/gen.py
@@ -112,7 +112,6 @@
         + ",".join(
             [
                 "buffer-results-to-out-params",
-                "air-linalg-to-func{link-with=mm.o}",
                 "air-par-to-herd{depth=-1}",
                 "air-par-to-launch{depth=0 has-air-segment=true}",
                 "scf-forall-to-for",
@@ -132,6 +131,6 @@
 
     backend = XRTBackend(
         omit_pingpong=True,
-        lower_linalg_to_func=True,
+        lower_linalg_to_func="mm.o",
     )
     module_function = backend.compile_and_load(air_module)