From 13908743e7b1a4baf2efa4a490c5712a0256e0e6 Mon Sep 17 00:00:00 2001 From: Jeff Fifield Date: Thu, 4 Apr 2024 17:24:56 -0600 Subject: [PATCH 1/2] Specify aie compiler for tests (#1175) Update tests that fail if chess is not the default compiler --- reference_designs/core/vector_add/Makefile | 2 +- reference_designs/core/vector_add/run_vck5000.lit | 4 ++-- reference_designs/core/vector_mult/Makefile | 2 +- reference_designs/core/vector_mult/run_vck5000.lit | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reference_designs/core/vector_add/Makefile b/reference_designs/core/vector_add/Makefile index a2df990621..9a1a7a2a56 100755 --- a/reference_designs/core/vector_add/Makefile +++ b/reference_designs/core/vector_add/Makefile @@ -43,7 +43,7 @@ vck5000: devicename=xcvc1902 vck5000: col=6 vck5000: build/aie.mlir - aiecc.py --link_against_hsa --host-target=x86_64-amd-linux-gnu build/aie.mlir \ + aiecc.py --xchesscc --link_against_hsa --host-target=x86_64-amd-linux-gnu build/aie.mlir \ -I/opt/xaiengine/include \ -I$(ACDC_AIE)/runtime_lib/x86_64-hsa/test_lib/include \ -I${ROCM_ROOT}/include \ diff --git a/reference_designs/core/vector_add/run_vck5000.lit b/reference_designs/core/vector_add/run_vck5000.lit index 83b350c50d..02055c5eca 100644 --- a/reference_designs/core/vector_add/run_vck5000.lit +++ b/reference_designs/core/vector_add/run_vck5000.lit @@ -1,9 +1,9 @@ // (c) Copyright 2023 Advanced Micro Devices, Inc. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// REQUIRES: hsa +// REQUIRES: hsa, chess // // RUN: %python %S/aie2.py xcvc1902 6 > ./aie.mlir -// RUN: %python aiecc.py %VitisSysrootFlag% --host-target=%aieHostTargetTriplet% %link_against_hsa% ./aie.mlir -I%host_runtime_lib%/test_lib/include %extraAieCcFlags% %S/test_vck5000.cpp -o test.elf -L%host_runtime_lib%/test_lib/lib -ltest_lib +// RUN: %python aiecc.py --xchesscc %VitisSysrootFlag% --host-target=%aieHostTargetTriplet% %link_against_hsa% ./aie.mlir -I%host_runtime_lib%/test_lib/include %extraAieCcFlags% %S/test_vck5000.cpp -o test.elf -L%host_runtime_lib%/test_lib/lib -ltest_lib // RUN: %run_on_vck5000 ./test.elf diff --git a/reference_designs/core/vector_mult/Makefile b/reference_designs/core/vector_mult/Makefile index 74ad28f7b6..330692f4fb 100755 --- a/reference_designs/core/vector_mult/Makefile +++ b/reference_designs/core/vector_mult/Makefile @@ -43,7 +43,7 @@ vck5000: devicename=xcvc1902 vck5000: col=6 vck5000: build/aie.mlir - aiecc.py --link_against_hsa --host-target=x86_64-amd-linux-gnu build/aie.mlir \ + aiecc.py --xchesscc --link_against_hsa --host-target=x86_64-amd-linux-gnu build/aie.mlir \ -I/opt/xaiengine/include \ -I$(ACDC_AIE)/runtime_lib/x86_64-hsa/test_lib/include \ -I${ROCM_ROOT}/include \ diff --git a/reference_designs/core/vector_mult/run_vck5000.lit b/reference_designs/core/vector_mult/run_vck5000.lit index 83b350c50d..02055c5eca 100644 --- a/reference_designs/core/vector_mult/run_vck5000.lit +++ b/reference_designs/core/vector_mult/run_vck5000.lit @@ -1,9 +1,9 @@ // (c) Copyright 2023 Advanced Micro Devices, Inc. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// REQUIRES: hsa +// REQUIRES: hsa, chess // // RUN: %python %S/aie2.py xcvc1902 6 > ./aie.mlir -// RUN: %python aiecc.py %VitisSysrootFlag% --host-target=%aieHostTargetTriplet% %link_against_hsa% ./aie.mlir -I%host_runtime_lib%/test_lib/include %extraAieCcFlags% %S/test_vck5000.cpp -o test.elf -L%host_runtime_lib%/test_lib/lib -ltest_lib +// RUN: %python aiecc.py --xchesscc %VitisSysrootFlag% --host-target=%aieHostTargetTriplet% %link_against_hsa% ./aie.mlir -I%host_runtime_lib%/test_lib/include %extraAieCcFlags% %S/test_vck5000.cpp -o test.elf -L%host_runtime_lib%/test_lib/lib -ltest_lib // RUN: %run_on_vck5000 ./test.elf From b334a0708021f0f8bbf06d9ea8916b7bebbb8d69 Mon Sep 17 00:00:00 2001 From: Eric Eaton Date: Thu, 4 Apr 2024 11:59:22 -0700 Subject: [PATCH 2/2] Update prebuilt me_basic.o for systems w/o Vitis --- aie_runtime_lib/AIE2/me_basic.o | Bin 6392 -> 6392 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/aie_runtime_lib/AIE2/me_basic.o b/aie_runtime_lib/AIE2/me_basic.o index 2351931952346b68b7016b884bd9ea2a7bdb2275..e274c186c794067d2270fa7a04b2929887603c6d 100644 GIT binary patch literal 6392 zcmeH~U2IfE6vwCbQ~78?N?Jjz(iE(r?AC@fCWX>%5s*Ryg;-*^-F7eO!ggDCFWce+ zlox`eA-sT=C~0^y8nhBai1DF*8&VAqMlB&gjQT_r9#um9|L?uip5E>l-*I5>{D0@1 znLBf4X1N?~*|sSsCr9a$qlyG6b$6*!kHA@{D)3yb7AVBlqGp81%Z@$h zs2cf9*@>uc5Yp*(dTp;u%1OIj?Y@NDcK6unv~#%MjwX|RPSlC_C23c^w$&9)$GdC# zl+_!JC#`rg?pT(cj48|7xTVF~xHGcZYTeP?vd!AlvUAs#9osFdHWUhnP%K0z;z>JZ zSz*i4Ls^j1BdPWm+pSH)P#dbBV_R1@#}uxuSJr+^#+!>bip$f%F1c}5_h6L4(M0?; z+n@a2?crL?s6Q3&jXUv-9S(P6$*I1Cm5w?s$};;?$r$|IPG2f*A&DtRgPW9?w0q#% zrt}G_<`_J<3tK*RIF<2B&t%H(J=c8M50%_fg=FyzWG0URlV$JhnAGIYu6 z@NzY~$I7p*Y^+FQNDYj;H(LOg;oSH$pzaM(&G`W*F8OZUUaO56R>R22Vo zTWJ_#hZ1&5{qOm=9PCG~ybRfc@rV2j>F;>m&V1P`m8b4a&4=R_s%Otr%l$yj_|8_> zgg*n_DEM{gA;E7$e=yDY>K*7t!Iz$In-z0sqASU-7xbjW1A<5>=lIy<4dw z_lXS}DGVCzjUC@Qu5-bQIh2C8}hGM~XgN z5*(`|v%W01;-yOVFLmcL6YudzL8#2LjpwQpoS!Z;k$6*)d=nT!XWYPc?sI&-W5fpGK2Y>S^~L<#{?rd%ma3s0%#J=X3Z!HVZ?m z=|pkg%L$;kefdHZ-q)N*UFpVujs4@WSJ86FZ_#p`M%4GAU2q7fE^t<^hus<_3=vS> zFt$9T9BhT(QdbE5jL?-rR|&lnngg-#9$|l3=)FR}BJ@6?JE55aj&s0osS`pch3*$R zCG-%qp3iY%KOyuYpqXH<>jzY}tUn2T zUFaJ^-}JSA#@xN5)_X*)_l3Gz#McO2D|8z)2V#7?u1qr%pBJWW}X`aGryY! zGsn9GGtc`3GuLs!%(o->IQXdG6X27APlC?~9tMvJ=AC&@F!%7XVD96mg1MIyf=9tW z3LXRhEcg=mzTl6*OYs8uY)%Tz5(7U_$GL_&piJ;Kb?Ykehv!e`N;_8`8g)| z0C-q1&(9lzd44Vk=J~lOnCIt;VD9(lg1O({3FdxJ3LXXj;xq3d@7y1PY5Pks^O}#3 z3bypYrAh?P2QTv(^1l}T(<#4u>cAP%nSK_GJS*;9a21V#!cT=qgzXw)#xMwNI-EaG z%TPHsm%=i%03Rl<@*a#~c^Xy5buPqsuE%@mxK)9;5`27XA0xG11I<+HQh_*bJ#(P# zOl7@bNHvVO5L(9Z_^~i9g1V<}aX*>m6U3FFl{w&+ZAa}8ao;0uBW$uD1@5OqRK%5H Y;$?D!5X1NKILAcX8YF%^5XUwD15mWpI{*Lx literal 6392 zcmeH~U2GIp7>3W%U*)F-DYgNzN-d;@vRfO{kQCc)ix4R^P>BV?u*K+oBt-_N}dLo2?yf z+qQ4oy2Y~U!r@35%|dlDk+S2K6|pRRNDFd$CI2AVKwY?DR&07N*)n%SR?l#ZyNx9i z&)NQ_c5aE(;Yb7NL|?*54BC-M4^BDVpR_VDr%hSrd^#0JzQ^fLXDpbQb~Ml#D=y<6 zxN(|i&Q5Q5##%Fu!4hT7I2C1O2D~j;gR$g6+iGnm_UsSVb+jw*?~0}>+yO(0xYN51 z#oe*g{^rJr$`x)g#G{6IYwoyVnHIw`Erw+b^(Ym#+eoEo)zhBtP8l* z>$_)&x0ohGO^H@R!n6`B%zbQlm^)#b02gyl$QAc|4Ay5F>jVB|e18n_7Sn{NDbZ?3 zm{x*6xsMHhawkj^;7{%ex#FHb!TQ0*$l8EGgZl9^B=F=IGI$sa8Qk}|GseaEAR49^ z7c)-b%{~42=o)o0)YPOVDk}3DDsE1djJ4b;shGG^vSwJR26#NOVX8=} z$s>71AzTgpr(&@x?HWA(fabB@+htg%QcdWHo{tTnO}5-A>iQY|=2X$-3se4D73Hc_ z*B?gJ0hZq2@uH=wArF8(7rVdM`B+h8367z%#|R<6*FC53gFN23{BEv*);>6T_11O0 zHb?F_%VWi77YEm(GkKLyR&jor>tD9s$j{+N0mh3M3o(9)k?|(3rh0-xjQISle9<@|^Jk-A#w8lh{2t`oWgnhSAmr-(l-^iH973%y6^z0mZ7>pbg^ z)JdUJLJtU?7W!qOUlE!wF0RKuF7#`@rdw?EgnBtTYpE-R)?P7QCF0sQ#i0VAgztu4}#%`ijt3g}&x%J{WA+n){G& z4R*%awbu6+WA}>qJYTbp*XRl!QeDgI^rK*2t6PG3z5W!;>r{xzdOok!LczRV%LEUA zR|@8Js}oFb8wJzfje_a%cERJ|JwDUZ<>(2)m0(9O@8`pUtH8$uSA$Oq=KVY_n0~z_ zn0}oXOus%9OusG(reEI*reEI+re8k^reD7areAq@c_QTALq{+!5PTF|A(;1hmEckE z8o|8Z*9oToZG!24hhX}@OYk^&pJ3kW2Lzu3zbN=!@auxlgFg^_0X!-AJ@BuBC&2S@ zGwbvJ2)t78C*WqmpMiG?{sMeZ@I~-Tf-iyJ5X@)vf?z(U9}B(${z~vw@TA~t;2(VE zbI51z7r~7EA=o`Hd^B-n4k=YCcpiAE&yfGN@gGR}9l`J5K{1(mHmp3O?oDttgMr4+ zhB+d388v6H2xGdOucxKxT$`uDHZmV|o^*d%!}bumtP3x|2O1N8({(GsvaS>#-#W)q ztye?SYTYVP7Y5J+9jBEIf+1B0>XH~)$JYrP>!Rp8>K6@=+1^K8IY#LLFWDCKE>ZV2 m>Y5Rg4HmfnOvXfA88%)nFA!>YT)sZyqHZ;ep9s|Poc{*6q0@H&