Skip to content

Commit

Permalink
Remove aie-only-generate-npu aiecc option, cleanup aie-generate-cdo use
Browse files Browse the repository at this point in the history
  • Loading branch information
@fifield
fifield committed Mar 5, 2025
1 parent bcadde6 commit f4d5dec
Show file tree
Hide file tree
Showing 103 changed files with 306 additions and 291 deletions.
4 changes: 2 additions & 2 deletions programming_examples/basic/dma_transpose/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge \
--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts.txt $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp
rm -rf _build
Expand Down
8 changes: 4 additions & 4 deletions programming_examples/basic/matrix_multiplication/makefile-common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,19 @@ ${trace_mlir_target}: ${srcdir}/${aie_py_src}

${xclbin_target}: ${mlir_target} ${kernels:%=build/%.o}
mkdir -p ${@D}
cd ${@D} && aiecc.py --alloc-scheme=${buffer_aloc_flag} --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --alloc-scheme=${buffer_aloc_flag} --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
$(if $(shell [ $(CHESS) != true ] && echo true), \
--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR}, \
) \
--aie-generate-npu --npu-insts-name=${insts_target:build/%=%} $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=${insts_target:build/%=%} $(<:%=../%)

${trace_xclbin_target}: ${trace_mlir_target} ${kernels:%=build/%.o}
mkdir -p ${@D}
cd ${@D} && aiecc.py --alloc-scheme=${buffer_aloc_flag} --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --alloc-scheme=${buffer_aloc_flag} --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
$(if $(shell [ $(CHESS) != true ] && echo true), \
--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR}, \
) \
--aie-generate-npu --npu-insts-name=${insts_target:build/%=%} $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=${insts_target:build/%=%} $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp ${srcdir}/../test.cpp ${srcdir}/../common.h
rm -rf _build
Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/matrix_scalar_add/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ all: build/final.xclbin

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
6 changes: 3 additions & 3 deletions programming_examples/basic/packet_switch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ else
echo "Device type not supported"
endif

# Build bitstream
# Build xclbin
${XCLBIN_TARGET}: ${XCLBIN_MLIR_SRCS} ${KERNEL_OBJS}
ifeq ($(DEVICE),npu1)
sed -i 's/npu2/npu1_1col/' $<
Expand All @@ -105,7 +105,7 @@ else
echo "Device type not supported"
endif
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host \
--xclbin-name=${@F} $(<:${HOME_DIR}/kernel/%=../../kernel/%)
cp ${XCLBIN_TARGET} ./final.xclbin

Expand All @@ -120,7 +120,7 @@ else
echo "Device type not supported"
endif
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-only-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-npu-insts --no-compile-host \
--npu-insts-name=${@:${BITSTREAM_O_DIR}/%=%} $(<:${HOME_DIR}/kernel/%=../../kernel/%)
cp $@ ./

Expand Down
14 changes: 3 additions & 11 deletions programming_examples/basic/passthrough_dmas/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ srcdir := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))

include ${srcdir}/../../makefile-common

all: build/final.xclbin build/insts.txt
all: build/final.xclbin

devicename ?= $(if $(NPU2),npu2,npu)
targetname = passthrough_dmas
Expand All @@ -29,19 +29,11 @@ build/aie.mlir: ${srcdir}/${aie_py_src}
mkdir -p ${@D}
python3 $< ${LENGTH} ${devicename} ${col} > $@

.PHONY: inst/insts.txt
inst/insts.txt: ${srcdir}/${aie_py_src}
rm -rf inst
mkdir -p inst
python3 $< ${LENGTH} > inst/aie.mlir
pushd inst && aiecc.py --aie-only-generate-npu --npu-insts-name=insts.txt aie.mlir && popd
${powershell} ./build/${targetname}.exe -x build/final.xclbin -i inst/insts.txt -k MLIR_AIE -l ${LENGTH}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge \
--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts.txt $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp
rm -rf _build
Expand Down
4 changes: 2 additions & 2 deletions programming_examples/basic/passthrough_kernel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ endif

build/final_${data_size}.xclbin: build/aie2_lineBased_8b_${data_size}.mlir build/passThrough.cc.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts_${data_size}.txt $(<:%=../%)

build/final_trace_${data_size}.xclbin: build/aie2_trace_lineBased_8b_${data_size}.mlir build/passThrough.cc.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts_${data_size}.txt $(<:%=../%)

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/passthrough_pykernel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final_${data_size}.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts_${data_size}.txt $(<:%=../%)

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/passthrough_pykernel/passthrough_pykernel.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"outputs": [],
"source": [
"!mkdir notebook_build\n",
"!cd notebook_build && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host --no-xchesscc --no-xbridge --xclbin-name=notebook.xclbin --npu-insts-name=notebook_insts.txt ../notebook_aie.mlir"
"!cd notebook_build && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host --no-xchesscc --no-xbridge --xclbin-name=notebook.xclbin --npu-insts-name=notebook_insts.txt ../notebook_aie.mlir"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions programming_examples/basic/row_wise_bias_add/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ ${mlir_target}: ${srcdir}/${aie_py_src}

${xclbin_target}: ${mlir_target} build/kernel.o
mkdir -p ${@D}
cd ${@D} && aiecc.py -v --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py -v --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge \
--aie-generate-npu --npu-insts-name=${insts_target:build/%=%} ${<:%=../%}
--aie-generate-npu-insts --npu-insts-name=${insts_target:build/%=%} ${<:%=../%}

${host_target}: ${srcdir}/test.cpp ${xclbin_target}
mkdir -p ${@D}
Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/tiling_exploration/per_tile/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ build/aie_${data_str}.mlir: ${srcdir}/${aie_py_src}

build/final_${data_str}.xclbin: build/aie_${data_str}.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts_${data_str}.txt $(<:%=../%)

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/tiling_exploration/tile_group/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ build/aie_${data_str}.mlir: ${srcdir}/${aie_py_src}

build/final_${data_str}.xclbin: build/aie_${data_str}.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts_${data_str}.txt $(<:%=../%)

Expand Down
4 changes: 2 additions & 2 deletions programming_examples/basic/vector_exp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir build/kernels.a
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge \
--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts.txt $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp
rm -rf _build
Expand Down
4 changes: 2 additions & 2 deletions programming_examples/basic/vector_reduce_add/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir build/reduce_add.cc.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts.txt $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp
rm -rf _build
Expand Down
4 changes: 2 additions & 2 deletions programming_examples/basic/vector_reduce_max/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir build/reduce_max.cc.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts.txt $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp
rm -rf _build
Expand Down
4 changes: 2 additions & 2 deletions programming_examples/basic/vector_reduce_min/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir build/reduce_min.cc.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts.txt $(<:%=../%)

${targetname}.exe: ${srcdir}/test.cpp
rm -rf _build
Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/vector_scalar_add/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/vector_scalar_add_runlist/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
16 changes: 8 additions & 8 deletions programming_examples/basic/vector_scalar_mul/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ build/aie_trace_${data_size}.mlir: ${srcdir}/${aie_py_src}
build/final_${data_size}.xclbin: build/aie_${data_size}.mlir build/scale.o
mkdir -p ${@D}
ifeq ($(CHESS), true)
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--aie-generate-npu-insts --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
else
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge \
--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
endif

build/final_trace_${data_size}.xclbin: build/aie_trace_${data_size}.mlir build/scale.o
mkdir -p ${@D}
ifeq ($(CHESS), true)
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--aie-generate-npu-insts --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
else
cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
cd ${@D} && aiecc.py --aie-generate-xclbin --no-compile-host --xclbin-name=${@F} \
--no-xchesscc --no-xbridge \
--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
--aie-generate-npu-insts --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
endif

${targetname}_${data_size}.exe: ${srcdir}/test.cpp
Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/vector_vector_add/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/vector_vector_add_BDs_init_values/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/vector_vector_modulo/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
2 changes: 1 addition & 1 deletion programming_examples/basic/vector_vector_mul/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ build/aie.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
5 changes: 1 addition & 4 deletions programming_examples/ml/bottleneck/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ build/${mlirFileName}.mlir: ${srcdir}/${aie_py_src}
mkdir -p ${@D}
python3 $< > $@

insts.txt: build/${mlirFileName}.mlir
aiecc.py -v --aie-only-generate-npu --npu-insts-name=$@ $<

build/conv2dk1.o: conv2dk1.cc
mkdir -p ${@D}
cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o ${@F}
Expand All @@ -43,7 +40,7 @@ build/conv2dk1_skip.o: conv2dk1_skip.cc

build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1.o build/conv2dk3.o build/conv2dk1_skip.o
mkdir -p ${@D}
cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py -v --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--alloc-scheme=basic-sequential \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
Expand Down
8 changes: 4 additions & 4 deletions programming_examples/ml/conv2d/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@ build/${mlirFileName}_trace.mlir: ${srcdir}/${aie_py_trace_src}
build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1_i8.o
mkdir -p ${@D}
ifeq ($(device),npu)
cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py -v --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)
else
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}
endif

build/final_trace.xclbin: build/${mlirFileName}_trace.mlir build/conv2dk1_i8.o
mkdir -p ${@D}
ifeq ($(device),npu)
cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py -v --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts_trace.txt $(<:%=../%)
else
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--xclbin-name=${@F} --npu-insts-name=insts_trace.txt ${<F}
endif

Expand Down
6 changes: 1 addition & 5 deletions programming_examples/ml/conv2d_fused_relu/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,13 @@ build/${mlirFileName}.mlir: ${srcdir}/${aie_py_src}
mkdir -p ${@D}
python3 $< > $@


insts.txt: build/${mlirFileName}.mlir
aiecc.py -v --aie-only-generate-npu --npu-insts-name=$@ $<

build/conv2dk1.o: conv2dk1.cc
mkdir -p ${@D}
cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang ${PEANOWRAP2_FLAGS} -DINT8_ACT -c $< -o$ ${@F}

build/final.xclbin: build/${mlirFileName}.mlir build/conv2dk1.o
mkdir -p ${@D}
cd ${@D} && aiecc.py -v --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py -v --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt $(<:%=../%)

Expand Down
4 changes: 2 additions & 2 deletions programming_examples/ml/eltwise_add/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ build/aie_trace.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir build/add.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

build/final_trace.xclbin: build/aie_trace.mlir build/add.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
4 changes: 2 additions & 2 deletions programming_examples/ml/eltwise_mul/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ build/aie_trace.mlir: ${srcdir}/${aie_py_src}

build/final.xclbin: build/aie.mlir build/mul.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

build/final_trace.xclbin: build/aie_trace.mlir build/mul.o
mkdir -p ${@D}
cd ${@D} && aiecc.py --aie-generate-cdo --aie-generate-npu --no-compile-host \
cd ${@D} && aiecc.py --aie-generate-xclbin --aie-generate-npu-insts --no-compile-host \
--no-xchesscc --no-xbridge \
--xclbin-name=${@F} --npu-insts-name=insts.txt ${<F}

Expand Down
Loading

0 comments on commit f4d5dec

Please sign in to comment.