Added chess option to vector_scalar_mul for section 4c

Xilinx · Oct 28, 2024 · fd5ff40 · fd5ff40
1 parent c04b219
commit fd5ff40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/programming_examples/basic/vector_scalar_mul/Makefile b/programming_examples/basic/vector_scalar_mul/Makefile
@@ -17,14 +17,19 @@ VPATH := ${srcdir}/../../../aie_kernels/aie2
 targetname = vectorScalar
 data_size = 4096
 trace_size = 8192
+use_chess = true
 
 all: build/final_${data_size}.xclbin build/insts_${data_size}.txt
 
 kristof: build/insts_${data_size}.txt
 
 build/%.o: %.cc
 	mkdir -p ${@D}
-	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}
+ifeq ($(use_chess), true)
+	cd ${@D} && xchesscc_wrapper ${CHESSCCWRAP2_FLAGS} -c $< -o ${@F}; 
+else 
+	cd ${@D} && ${PEANO_INSTALL_DIR}/bin/clang++ ${PEANOWRAP2_FLAGS} -c $< -o ${@F}; 
+endif
 
 build/aie_${data_size}.mlir: ${srcdir}/aie2.py
 	mkdir -p ${@D}
@@ -39,12 +44,17 @@ build/final_${data_size}.xclbin: build/aie_${data_size}.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
 				--no-xchesscc --no-xbridge \
+    			$(if $(shell [ $(use_chess) != true ] && echo true), \
+    			    --no-xchesscc --no-xbridge \
+    			) \
 				--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 build/final_trace_${data_size}.xclbin: build/aie_trace_${data_size}.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
-				--no-xchesscc --no-xbridge \
+    			$(if $(shell [ $(use_chess) != true ] && echo true), \
+    			    --no-xchesscc --no-xbridge \
+    			) \
 				--aie-generate-npu --npu-insts-name=insts_${data_size}.txt $(<:%=../%)
 
 ${targetname}_${data_size}.exe: ${srcdir}/test.cpp

diff --git a/programming_guide/section-4/section-4b/Makefile b/programming_guide/section-4/section-4b/Makefile
@@ -37,15 +37,15 @@ build/final.xclbin: build/aie.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
     			$(if $(shell [ $(use_chess) != true ] && echo true), \
-    			    --no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
+    			    --no-xchesscc --no-xbridge \
     			) \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)
 
 build/trace.xclbin: build/aie_trace.mlir build/scale.o
 	mkdir -p ${@D}
 	cd ${@D} && aiecc.py -v --aie-generate-cdo --no-compile-host --xclbin-name=${@F} \
     			$(if $(shell [ $(use_chess) != true ] && echo true), \
-    			    --no-xchesscc --no-xbridge --peano ${PEANO_INSTALL_DIR} \
+    			    --no-xchesscc --no-xbridge \
     			) \
 				--aie-generate-npu --npu-insts-name=insts.txt $(<:%=../%)