From 1e89817f2f56b42bf27bd833fd5a83b134cbc58c Mon Sep 17 00:00:00 2001 From: AndraBisca Date: Tue, 23 Dec 2025 01:59:37 -0700 Subject: [PATCH 1/3] Update dynamic objectfifo lowering tests --- test/npu-xrt/dynamic_object_fifo/nested_loops/aie2.py | 2 +- test/npu-xrt/dynamic_object_fifo/ping_pong/aie2.py | 2 +- test/npu-xrt/dynamic_object_fifo/reduction/aie2.py | 2 +- test/npu-xrt/dynamic_object_fifo/sliding_window/aie2.py | 2 +- .../dynamic_object_fifo/sliding_window_conditional/aie2.py | 2 +- .../npu-xrt/dynamic_object_fifo/two_core_sliding_window/aie2.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/npu-xrt/dynamic_object_fifo/nested_loops/aie2.py b/test/npu-xrt/dynamic_object_fifo/nested_loops/aie2.py index 2221a7bf392..9bdd0d92c2f 100644 --- a/test/npu-xrt/dynamic_object_fifo/nested_loops/aie2.py +++ b/test/npu-xrt/dynamic_object_fifo/nested_loops/aie2.py @@ -10,7 +10,7 @@ # RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/kernel.cc -o ./kernel.o # RUN: %python %S/aie2.py > ./aie2.mlir # RUN: clang %S/test.cpp -o test.exe -std=c++17 -Wall %xrt_flags -lrt -lstdc++ %test_utils_flags -# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --dynamic-objFifos --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir +# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir # RUN: %run_on_npu1% ./test.exe -x final.xclbin -k MLIR_AIE -i insts.bin import numpy as np diff --git a/test/npu-xrt/dynamic_object_fifo/ping_pong/aie2.py b/test/npu-xrt/dynamic_object_fifo/ping_pong/aie2.py index 299370178c0..414119973a7 100644 --- a/test/npu-xrt/dynamic_object_fifo/ping_pong/aie2.py +++ b/test/npu-xrt/dynamic_object_fifo/ping_pong/aie2.py @@ -9,7 +9,7 @@ # # RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/kernel.cc -o ./kernel.o # RUN: %python %S/aie2.py > ./aie2.mlir -# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --dynamic-objFifos --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir +# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir # RUN: clang %S/test.cpp -o test.exe -std=c++17 -Wall %xrt_flags -lrt -lstdc++ %test_utils_flags # RUN: %run_on_npu1% ./test.exe import numpy as np diff --git a/test/npu-xrt/dynamic_object_fifo/reduction/aie2.py b/test/npu-xrt/dynamic_object_fifo/reduction/aie2.py index ffd36c9f6aa..830ba3a3fa9 100644 --- a/test/npu-xrt/dynamic_object_fifo/reduction/aie2.py +++ b/test/npu-xrt/dynamic_object_fifo/reduction/aie2.py @@ -9,7 +9,7 @@ # # RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/kernel.cc -o ./kernel.o # RUN: %python %S/aie2.py > ./aie2.mlir -# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --dynamic-objFifos --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir +# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir # RUN: clang %S/test.cpp -o test.exe -std=c++17 -Wall %xrt_flags -lrt -lstdc++ %test_utils_flags # RUN: %run_on_npu1% ./test.exe import numpy as np diff --git a/test/npu-xrt/dynamic_object_fifo/sliding_window/aie2.py b/test/npu-xrt/dynamic_object_fifo/sliding_window/aie2.py index 79709877940..f6d001b8007 100644 --- a/test/npu-xrt/dynamic_object_fifo/sliding_window/aie2.py +++ b/test/npu-xrt/dynamic_object_fifo/sliding_window/aie2.py @@ -9,7 +9,7 @@ # # RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/kernel.cc -o ./kernel.o # RUN: %python %S/aie2.py > ./aie2.mlir -# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --dynamic-objFifos --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir +# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir # RUN: clang %S/test.cpp -o test.exe -std=c++17 -Wall %xrt_flags -lrt -lstdc++ %test_utils_flags # RUN: %run_on_npu1% ./test.exe diff --git a/test/npu-xrt/dynamic_object_fifo/sliding_window_conditional/aie2.py b/test/npu-xrt/dynamic_object_fifo/sliding_window_conditional/aie2.py index 0e43a7b0b99..705cd8a08ae 100644 --- a/test/npu-xrt/dynamic_object_fifo/sliding_window_conditional/aie2.py +++ b/test/npu-xrt/dynamic_object_fifo/sliding_window_conditional/aie2.py @@ -10,7 +10,7 @@ # RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/kernel.cc -o ./kernel.o # RUN: clang %S/test.cpp -o test.exe -std=c++17 -Wall %xrt_flags -lrt -lstdc++ %test_utils_flags # RUN: %python %S/aie2.py > ./aie2.mlir -# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --dynamic-objFifos --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir +# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir # RUN: %run_on_npu1% ./test.exe import numpy as np diff --git a/test/npu-xrt/dynamic_object_fifo/two_core_sliding_window/aie2.py b/test/npu-xrt/dynamic_object_fifo/two_core_sliding_window/aie2.py index 72fa89fe959..e2c9981d7a5 100644 --- a/test/npu-xrt/dynamic_object_fifo/two_core_sliding_window/aie2.py +++ b/test/npu-xrt/dynamic_object_fifo/two_core_sliding_window/aie2.py @@ -9,7 +9,7 @@ # # RUN: xchesscc_wrapper aie2 -I %aietools/include -c %S/kernel.cc -o ./kernel.o # RUN: %python %S/aie2.py > ./aie2.mlir -# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --dynamic-objFifos --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir +# RUN: %python aiecc.py --no-aiesim --aie-generate-npu-insts --aie-generate-xclbin --no-compile-host --xclbin-name=final.xclbin --npu-insts-name=insts.bin ./aie2.mlir # RUN: clang %S/test.cpp -o test.exe -std=c++17 -Wall %xrt_flags -lrt -lstdc++ %test_utils_flags # RUN: %run_on_npu1% ./test.exe From b953c1ffd5d9d9a9efd92536ce3549184427c7d1 Mon Sep 17 00:00:00 2001 From: abisca Date: Mon, 23 Mar 2026 01:21:14 -0600 Subject: [PATCH 2/3] Enable dynamic objectfifo lowering by default in C++ aiecc The original change defaulted --dynamic-objFifos to true in cl_arguments.py (Python aiecc), but that file was deleted when aiecc.py was deprecated in favour of the C++ aiecc. Apply the equivalent change to tools/aiecc/aiecc.cpp. Co-Authored-By: Claude Sonnet 4.6 --- tools/aiecc/aiecc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/aiecc/aiecc.cpp b/tools/aiecc/aiecc.cpp index 6b8cb018b99..bde1ed23615 100644 --- a/tools/aiecc/aiecc.cpp +++ b/tools/aiecc/aiecc.cpp @@ -305,7 +305,7 @@ static cl::opt dryRun("n", static cl::opt dynamicObjFifos("dynamic-objFifos", cl::desc("Use dynamic object FIFOs"), - cl::init(false), + cl::init(true), cl::cat(aieCompilerOptions)); static cl::opt packetSwObjFifos("packet-sw-objFifos", From 2434f47eb1f529d54fb16ee1cd6089fba1e18bcc Mon Sep 17 00:00:00 2001 From: abisca Date: Tue, 24 Mar 2026 09:53:05 -0600 Subject: [PATCH 3/3] Disable dynamic objectfifo lowering for swiglu. --- programming_examples/ml/swiglu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programming_examples/ml/swiglu/Makefile b/programming_examples/ml/swiglu/Makefile index 30b99d0d7e4..6cb0c496b9c 100644 --- a/programming_examples/ml/swiglu/Makefile +++ b/programming_examples/ml/swiglu/Makefile @@ -63,7 +63,7 @@ build/final.xclbin: build/${targetname}.mlir build/kernels.a mkdir -p ${@D} cd ${@D} && aiecc --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \ --xclbin-name=${@F} \ - --no-xchesscc --no-xbridge \ + --no-xchesscc --no-xbridge --dynamic-objFifos=false \ --aie-generate-npu --npu-insts-name=insts.bin $(<:%=../%) ${targetname}.exe: ${srcdir}/test.cpp