From 296d1606f2ab40f5b56b36d0df856588dcfb0c45 Mon Sep 17 00:00:00 2001 From: "Yaxun (Sam) Liu" Date: Thu, 11 Jul 2019 23:13:35 -0400 Subject: [PATCH 1/2] Add amdgpu targets gfx1010 and gfx1012 (#1211) [ROCm/hip commit: 2b5ff1678a8c7e65b52d1c33609341c3ce932cd0] --- projects/hip/bin/hipcc | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/projects/hip/bin/hipcc b/projects/hip/bin/hipcc index 5b25d01fcf..d2fa9a2306 100755 --- a/projects/hip/bin/hipcc +++ b/projects/hip/bin/hipcc @@ -156,6 +156,8 @@ $target_gfx802 = 0; $target_gfx803 = 0; $target_gfx900 = 0; $target_gfx906 = 0; +$target_gfx1010 = 0; +$target_gfx1012 = 0; $default_amdgpu_target = 1; if ($HIP_PLATFORM eq "clang") { @@ -427,6 +429,16 @@ foreach $arg (@ARGV) $target_gfx906 = 1; $default_amdgpu_target = 0; } + if($arg eq '--amdgpu-target=gfx1010') + { + $target_gfx1010 = 1; + $default_amdgpu_target = 0; + } + if($arg eq '--amdgpu-target=gfx1012') + { + $target_gfx1012 = 1; + $default_amdgpu_target = 0; + } # hip-clang does not accept --amdgpu-target= options. if (($arg =~ /--amdgpu-target=/) and $HIP_PLATFORM eq 'clang' ) { @@ -658,6 +670,16 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){ $target_gfx906 = 1; $default_amdgpu_target = 0; } + if($target eq 'gfx1010') + { + $target_gfx1010 = 1; + $default_amdgpu_target = 0; + } + if($target eq 'gfx1012') + { + $target_gfx1012 = 1; + $default_amdgpu_target = 0; + } } } # Else try using rocm_agent_enumerator @@ -693,6 +715,16 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){ $target_gfx906 = 1; $default_amdgpu_target = 0; } + if($val eq 'gfx1010') + { + $target_gfx1010 = 1; + $default_amdgpu_target = 0; + } + if($val eq 'gfx1012') + { + $target_gfx1012 = 1; + $default_amdgpu_target = 0; + } } } # rocm_agent_enumerator failed! Throw an error and die if linking is required @@ -757,6 +789,22 @@ if($HIP_PLATFORM eq "hcc" or $HIP_PLATFORM eq "clang"){ } $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX906__=1 "; } + if ($target_gfx1010 eq 1) { + $GPU_ARCH_ARG = $GPU_ARCH_OPT . "gfx1010"; + $HIPLDFLAGS .= $GPU_ARCH_ARG; + if ($HIP_PLATFORM eq 'clang') { + $HIPCXXFLAGS .= $GPU_ARCH_ARG;; + } + $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX1010__=1 "; + } + if ($target_gfx1012 eq 1) { + $GPU_ARCH_ARG = $GPU_ARCH_OPT . "gfx1012"; + $HIPLDFLAGS .= $GPU_ARCH_ARG; + if ($HIP_PLATFORM eq 'clang') { + $HIPCXXFLAGS .= $GPU_ARCH_ARG;; + } + $HIPCXXFLAGS .= " -D__HIP_ARCH_GFX1012__=1 "; + } } if ($hasC and $HIP_PLATFORM eq 'nvcc') { From 5b1910d14038c3dc1f03d4b8634767880fe35a89 Mon Sep 17 00:00:00 2001 From: kpyzhov Date: Thu, 11 Jul 2019 23:13:45 -0400 Subject: [PATCH 2/2] Added gfx906 kernel binary to the HIPFB file for hipModule test. (#1215) [ROCm/hip commit: e6a8d1daee49044b70bab9e9f1768f457ea4f656] --- .../src/runtimeApi/module/vcpy_kernel.code | Bin 9456 -> 19321 bytes 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 projects/hip/tests/src/runtimeApi/module/vcpy_kernel.code diff --git a/projects/hip/tests/src/runtimeApi/module/vcpy_kernel.code b/projects/hip/tests/src/runtimeApi/module/vcpy_kernel.code old mode 100755 new mode 100644 index 4246151be15f18f6ca4c6924779f4d6b05680982..40894f972ade2fbeea4a94b9a4cd8f54a0aba130 GIT binary patch literal 19321 zcmeHP&u`pR5T4x)ZCZX6xU>j?BMMYNOjJU&AW?0|CIxAmw1^(K;5zHKUMpVPvc2i1 z2U;qSdWfL(6eJD^)E0HXHs)KqO|ylTC1c)D7fw5$@SaYZA+EfX4uo*i(S(_>r3YCKP zUxJ&E&37n4MaypvsmY5HDo}=P^7;@w09)jGAd{*6iUPT-#x3oba8S!pjCN~{6I;~| zA?SF}?mpbo>t1|QnE@f~qaDTy243VavTKf!UJ~}&MWjEX6$$kcpsHp&6cie5iRy+GY3CX6psK7k~d@J`1iQ@;V`wt!l zIC(*(qd6zyK={e0pPV)A*iDu`x?tLl6N@CVlE|)$^R5U)?A6bkVWW|V6waE7cT5Z} zoAb8c7S@~>IN!N`IBWaXY`f7AG3}%ak@%|d^4>dn9Ne(S4=I=(eM~PmJ;xD&rDIZ2 zTb)%=d1IrwkDcrGv9P8OW8FTE_4?>#=bVb0zTuueo|pAE48lNkyZh2B-@)6+KkBW# zF>hB)HxAp8l?b;bg4Akw9pPA*OmI0%Lz#d1rtN!fF!=pnucE5c~qL1n13Up*0)&7rGppbB=sGx!J%awdgjxXdboa zMI#O+AK6!<*OI9w@Rk^ST0vN3Ks@e|?|3gy(#A)=R{5M;}pg_UAx5 z9N95tSxqmp95L_Jh1C>x1gj*Ge7N}JT<9XSdoIaU-Zp<-p@V!a7ln(kDEB18JeUDy zfEi#0m;q*h8Mr456k+=c-uNU8?A{8et`5Q%SC6kOUMm!f@5>)udruULWq^Y>q)MqI zWkoHEVDTD2bVL2{`asTkFayj0Gr$Zm1Iz$3zzi@0%m6dM3@`)Cz<-qisu|zXg_iqu zpgT2E{pBaExLwO9HU9eh?GUGt-lzKT=j2%H5!AduR)=3RYPG5{YK}l1t8Rv_Oc`Z! z#30T7nBBK1i!42QSO@wy>sDX}VJg6M76Mt61Je!KX46iZpsy%TV=&{;u~Qq&RCLlz z+irPvFlUnl%zD_uA|+s1FSTbSHl>Z4DO_Ez+GGXGs=hlte&DT%{seANio9Y8k7{qd zeFD@MKyK;z(;96tr^uf2jIg5>G0*T`R6e8pdsxbTyL~$(d&)CH>_@>t`(&@A0N7}Q zzG@_rcVd(nQ#PA>to z5JS>tBnGnIolDe&!Y8arF>%+ex@4%;X)SzEBI;56lt1rCSsuIAMc6Z>7L6_$PU*fR zeos#N*?+9T`Ls!2MO5WsdEb0cL<1UUZJ(s{a2MfcvXdj&gsM X;(`0C=*+6pBtzZ)lFR<@{Z)Se7&?*t literal 9456 zcmeHN&2Jk;6o0WzKU@$&TuPB(B2@~4dgX=^g>t|l#u2I$(i&2s3e3hku~%8|uGV%) zIMBk0Lk@@&TsU&#z>!;f>>tqs7ybkg7YOgoytj6&1hrBRIm}4AZ|3(t=Iw81HtW2- z`+l=gn3<^ow<7!wGt{58K+OvHboAWO)<)m@;;JJVA5Ou|x?UBkvV0F4E+N5J}3JcwJtr z1G!V5@R#u*H^NJB7T3zS5r)U=#>dw7B~)EtTfZN4J8=aC9le2HsdTsZ-mVhW6!#yT zq|COJN~OH1vq6}|*Ojz8>gp9$RiBn`=q%RJV5})CRZ;7HUymVl>ggy-+FvAD6rh1p zt^NL15>1%RPgvA;f_Y=r^yBWx?~X%#nCf_?saB3?^W^TR1)CJju$*-#vO>W4P;#yC z%W*_9U1AkFMPYa1DkoK&el*fI!Z?uYT8)w|KYDMpy{)r6fU){$Kg}m-yt$AomxCZ{ zrG7`>9QhH2S=F)5!pZ`2Y$iiKJs82RH8l3No+^F0BuHMcPnN+F8YaDld)NieB+{#nU?=31ek0``r&EIQ8 z{_u8^?bw{n>R5PdvFv#s?SYdT?ZLSs?#%r8R5PY8=C~c(9R=_@;+Kl}D!-w{N8`qcu4z_4t`8v4{gnPd@>>1?OvF+1HBt|bi1eh z6pkP%Zm9Nl*p6Qx4RFr95sr1GQt8YgwlQ*gdIcyyplrT@(&f7k4(`ts3SVLR3-=0zC4h}b zs45l_D=?PA!F_=Ak$vI)8vCv}1{?#90mp!2z%k$$a11yG90QI4$ADwt^fMqex-N^!_Z?xsXZ;S{?C686JyVMss&N2Nnkt7&&@F2(b;v?Y}VB^uL_+AtEp<& zR&v#nS5>*`u^lsS;Vi(E9sS$lY1F;Ii<6-SFW8R<`+e}b@yP4>gC6ji@L>ktQ11|XXVkF*W*^f+VxM?m)Aa6IhK$o1c@hPFR#%} z*Zrl=FJa|=%9wnqUN1F1SvMj-XG2;yG?#qWAnWOQ#Qr)wOvL{puM?54vA^iWpJAZy z1t_-YWu1wf_LuxczKXt7s}z4(*CJ(IqlsyB4U=si2ZZIzTmJDiRX@#rrUF#hH?Nl} zwq%*|Q1+c%zf42<5tjQ`twa8OihPH{am0^@@D6q;C3X`S#Q$=R*p8$xvW~EDH);BV vvZFl)pG8S_lE2*lCSrN+Y)fKx&JI4Cz^E(p3cQJ(