From 8329b6ca9e84471ae6aabf8e5be520d196b76e54 Mon Sep 17 00:00:00 2001 From: Jeff Fifield Date: Thu, 24 Oct 2024 13:35:58 -0600 Subject: [PATCH] Remove extra prerequisite from makefile rules in programming guide and examples (#1883) --- programming_examples/basic/dma_transpose/Makefile | 2 +- programming_examples/basic/matrix_scalar_add/Makefile | 2 +- programming_examples/basic/passthrough_dmas/Makefile | 2 +- programming_examples/basic/vector_exp/Makefile | 2 +- programming_examples/basic/vector_reduce_add/Makefile | 2 +- programming_examples/basic/vector_reduce_max/Makefile | 2 +- programming_examples/basic/vector_reduce_min/Makefile | 2 +- programming_examples/basic/vector_scalar_add/Makefile | 2 +- .../basic/vector_scalar_add_runlist/Makefile | 2 +- programming_examples/basic/vector_vector_add/Makefile | 2 +- programming_examples/basic/vector_vector_modulo/Makefile | 2 +- programming_examples/basic/vector_vector_mul/Makefile | 2 +- programming_examples/ml/eltwise_add/Makefile | 4 ++-- programming_examples/ml/eltwise_mul/Makefile | 4 ++-- programming_examples/ml/relu/Makefile | 4 ++-- programming_examples/ml/softmax/Makefile | 6 +++--- .../section-2/section-2e/02_external_mem_to_core/Makefile | 2 +- .../section-2e/03_external_mem_to_core_L2/Makefile | 2 +- .../section-2/section-2e/04_distribute_L2/Makefile | 2 +- programming_guide/section-2/section-2e/05_join_L2/Makefile | 2 +- programming_guide/section-3/Makefile | 2 +- programming_guide/section-4/section-4a/Makefile | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/programming_examples/basic/dma_transpose/Makefile b/programming_examples/basic/dma_transpose/Makefile index 76d3214afc..87771d1ab0 100644 --- a/programming_examples/basic/dma_transpose/Makefile +++ b/programming_examples/basic/dma_transpose/Makefile @@ -41,7 +41,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE --M ${M} --K ${K} clean: diff --git a/programming_examples/basic/matrix_scalar_add/Makefile b/programming_examples/basic/matrix_scalar_add/Makefile index f4ab08e26d..2ef8b41066 100644 --- a/programming_examples/basic/matrix_scalar_add/Makefile +++ b/programming_examples/basic/matrix_scalar_add/Makefile @@ -56,7 +56,7 @@ vck5000: build/aie.mlir -Wl,-R/opt/xaiengine/lib \ -Wl,--whole-archive -Wl,--no-whole-archive -lstdc++ -ldl -lelf -o test.elf -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/basic/passthrough_dmas/Makefile b/programming_examples/basic/passthrough_dmas/Makefile index 5b61b999bf..bd5fc73651 100644 --- a/programming_examples/basic/passthrough_dmas/Makefile +++ b/programming_examples/basic/passthrough_dmas/Makefile @@ -47,7 +47,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE -l ${LENGTH} # Changing variables when we target VCK5000 diff --git a/programming_examples/basic/vector_exp/Makefile b/programming_examples/basic/vector_exp/Makefile index a546a809c2..0101c64552 100644 --- a/programming_examples/basic/vector_exp/Makefile +++ b/programming_examples/basic/vector_exp/Makefile @@ -50,7 +50,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/basic/vector_reduce_add/Makefile b/programming_examples/basic/vector_reduce_add/Makefile index a98a1f223b..2b59a78f41 100644 --- a/programming_examples/basic/vector_reduce_add/Makefile +++ b/programming_examples/basic/vector_reduce_add/Makefile @@ -45,7 +45,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE trace: diff --git a/programming_examples/basic/vector_reduce_max/Makefile b/programming_examples/basic/vector_reduce_max/Makefile index c642abd684..225190998c 100755 --- a/programming_examples/basic/vector_reduce_max/Makefile +++ b/programming_examples/basic/vector_reduce_max/Makefile @@ -47,7 +47,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE trace: diff --git a/programming_examples/basic/vector_reduce_min/Makefile b/programming_examples/basic/vector_reduce_min/Makefile index 9a64469ca1..9ccfd039ae 100755 --- a/programming_examples/basic/vector_reduce_min/Makefile +++ b/programming_examples/basic/vector_reduce_min/Makefile @@ -45,7 +45,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE trace: diff --git a/programming_examples/basic/vector_scalar_add/Makefile b/programming_examples/basic/vector_scalar_add/Makefile index 677abb9c03..730c044574 100644 --- a/programming_examples/basic/vector_scalar_add/Makefile +++ b/programming_examples/basic/vector_scalar_add/Makefile @@ -37,7 +37,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/basic/vector_scalar_add_runlist/Makefile b/programming_examples/basic/vector_scalar_add_runlist/Makefile index 677abb9c03..730c044574 100644 --- a/programming_examples/basic/vector_scalar_add_runlist/Makefile +++ b/programming_examples/basic/vector_scalar_add_runlist/Makefile @@ -37,7 +37,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/basic/vector_vector_add/Makefile b/programming_examples/basic/vector_vector_add/Makefile index eaf0a1aa39..2416e3322f 100755 --- a/programming_examples/basic/vector_vector_add/Makefile +++ b/programming_examples/basic/vector_vector_add/Makefile @@ -53,7 +53,7 @@ vck5000: build/aie.mlir ${srcdir}/../../../install/runtime_lib/x86_64-hsa/test_lib/src/test_library.cpp \ -Wl,--whole-archive -Wl,--no-whole-archive -lstdc++ -ldl -lelf -o test.elf -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/basic/vector_vector_modulo/Makefile b/programming_examples/basic/vector_vector_modulo/Makefile index a5a7721b52..06cbd2e327 100755 --- a/programming_examples/basic/vector_vector_modulo/Makefile +++ b/programming_examples/basic/vector_vector_modulo/Makefile @@ -56,7 +56,7 @@ vck5000: build/aie.mlir -Wl,-R/opt/xaiengine/lib \ -Wl,--whole-archive -Wl,--no-whole-archive -lstdc++ -ldl -lelf -o test.elf -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/basic/vector_vector_mul/Makefile b/programming_examples/basic/vector_vector_mul/Makefile index ba30fe1437..f5bbef8d3b 100755 --- a/programming_examples/basic/vector_vector_mul/Makefile +++ b/programming_examples/basic/vector_vector_mul/Makefile @@ -57,7 +57,7 @@ vck5000: build/aie.mlir -Wl,--whole-archive -Wl,--no-whole-archive -lstdc++ -ldl -lelf -o test.elf -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_examples/ml/eltwise_add/Makefile b/programming_examples/ml/eltwise_add/Makefile index 2628da1fb8..eb6118cfb6 100644 --- a/programming_examples/ml/eltwise_add/Makefile +++ b/programming_examples/ml/eltwise_add/Makefile @@ -55,10 +55,10 @@ else endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE -trace: ${targetname}.exe build/final_trace.xclbin build/insts.txt +trace: ${targetname}.exe build/final_trace.xclbin ${powershell} ./$< -x build/final_trace.xclbin -i build/insts.txt -k MLIR_AIE -t ${trace_size} ../../utils/parse_eventIR.py --filename trace.txt --mlir build/aie_trace.mlir --colshift 1 > parse_eventIR_vs.json diff --git a/programming_examples/ml/eltwise_mul/Makefile b/programming_examples/ml/eltwise_mul/Makefile index ccf87b3fe4..25f85d13bb 100644 --- a/programming_examples/ml/eltwise_mul/Makefile +++ b/programming_examples/ml/eltwise_mul/Makefile @@ -55,10 +55,10 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE -trace: ${targetname}.exe build/final_trace.xclbin build/insts.txt +trace: ${targetname}.exe build/final_trace.xclbin ${powershell} ./$< -x build/final_trace.xclbin -i build/insts.txt -k MLIR_AIE -t ${trace_size} ../../utils/parse_eventIR.py --filename trace.txt --mlir build/aie_trace.mlir --colshift 1 > parse_eventIR_vs.json clean: diff --git a/programming_examples/ml/relu/Makefile b/programming_examples/ml/relu/Makefile index 4705618de9..49beea23b3 100644 --- a/programming_examples/ml/relu/Makefile +++ b/programming_examples/ml/relu/Makefile @@ -54,10 +54,10 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE -trace: ${targetname}.exe build/final_trace.xclbin build/insts.txt +trace: ${targetname}.exe build/final_trace.xclbin ${powershell} ./$< -x build/final_trace.xclbin -i build/insts.txt -k MLIR_AIE -t ${trace_size} ../../utils/parse_eventIR.py --filename trace.txt --mlir build/aie_trace.mlir --colshift 1 > parse_eventIR_vs.json diff --git a/programming_examples/ml/softmax/Makefile b/programming_examples/ml/softmax/Makefile index 0f0ae172ee..41b35843af 100755 --- a/programming_examples/ml/softmax/Makefile +++ b/programming_examples/ml/softmax/Makefile @@ -68,13 +68,13 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE -profile: ${targetname}.exe build/final.xclbin build/insts.txt +profile: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE -p results.csv -trace: ${targetname}.exe build/final_trace.xclbin build/insts.txt +trace: ${targetname}.exe build/final_trace.xclbin ${powershell} ./$< -x build/final_trace.xclbin -i build/insts.txt -k MLIR_AIE -t ${trace_size} ../../utils/parse_eventIR.py --filename trace.txt --mlir build/aie_trace.mlir --colshift 1 > parse_eventIR_vs.json diff --git a/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile b/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile index 360f443dd1..fb36b7c9fd 100644 --- a/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile +++ b/programming_guide/section-2/section-2e/02_external_mem_to_core/Makefile @@ -37,7 +37,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile b/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile index 1a14f5d5a8..6561ad00fb 100644 --- a/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile +++ b/programming_guide/section-2/section-2e/03_external_mem_to_core_L2/Makefile @@ -37,7 +37,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_guide/section-2/section-2e/04_distribute_L2/Makefile b/programming_guide/section-2/section-2e/04_distribute_L2/Makefile index 902ebbb30b..f85f6d8373 100644 --- a/programming_guide/section-2/section-2e/04_distribute_L2/Makefile +++ b/programming_guide/section-2/section-2e/04_distribute_L2/Makefile @@ -37,7 +37,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_guide/section-2/section-2e/05_join_L2/Makefile b/programming_guide/section-2/section-2e/05_join_L2/Makefile index aedfb86167..a05d31c899 100644 --- a/programming_guide/section-2/section-2e/05_join_L2/Makefile +++ b/programming_guide/section-2/section-2e/05_join_L2/Makefile @@ -37,7 +37,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE clean: diff --git a/programming_guide/section-3/Makefile b/programming_guide/section-3/Makefile index 7b0a84983b..33f0868060 100644 --- a/programming_guide/section-3/Makefile +++ b/programming_guide/section-3/Makefile @@ -39,7 +39,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE run_py: build/final.xclbin build/insts.txt diff --git a/programming_guide/section-4/section-4a/Makefile b/programming_guide/section-4/section-4a/Makefile index b301cd5d6d..811831920a 100644 --- a/programming_guide/section-4/section-4a/Makefile +++ b/programming_guide/section-4/section-4a/Makefile @@ -39,7 +39,7 @@ else cp _build/${targetname} $@ endif -run: ${targetname}.exe build/final.xclbin build/insts.txt +run: ${targetname}.exe build/final.xclbin ${powershell} ./$< -x build/final.xclbin -i build/insts.txt -k MLIR_AIE run-10: ${targetname}.exe build/final.xclbin build/insts.txt