Commit Graph

296 Commits

Author SHA1 Message Date
Sarbojit Sarkar 8587ec2976 SWDEV:253548 : remove gfx-arch macros
Change-Id: I1ef0b4e080c15a9c6228f48ecd6a65b134d0a72d


[ROCm/clr commit: 3f0e33adb5]
2020-10-06 01:15:58 -04:00
Vladislav Sytchenko 7b635ae18c Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""
This reverts commit 0627e8783b.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9


[ROCm/clr commit: d5aa0f607d]
2020-10-05 13:20:58 -04:00
Vladislav Sytchenko 0627e8783b Revert "Merge branch 'amd-master-next' into amd-npi-next"
This reverts commit 6c6299acb2.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I53322718dadde2c98f96140b8e260ec7ee9ef721


[ROCm/clr commit: 9142674ef0]
2020-10-05 13:02:39 -04:00
Vladislav Sytchenko 6c6299acb2 Merge branch 'amd-master-next' into amd-npi-next
Change-Id: I0587f67e28cec51c2ae753e986d2c7ce21db271e


[ROCm/clr commit: d7c02619d6]
2020-10-05 09:51:06 -04:00
Srinivasan Subramanian 04c782ad9a hipcc doesn't find libhsakmt without ldconf entries
Signed-off-by: Srinivasan Subramanian <srinivasan.subramanian@amd.com>
Change-Id: Iea6a43786f05c9e44dcf863f4f96a53f81384dbd


[ROCm/clr commit: 8b889ad26e]
2020-10-02 12:55:00 -04:00
kjayapra-amd ae01218741 SWDEV-251941 - Adding gfx1030, gfx1031 support to mainline.
Change-Id: Ifbe0d72646f5f00c7b8e16338587fc564a314b92


[ROCm/clr commit: c3aa54d4e2]
2020-09-14 17:10:17 -04:00
Vladislav Sytchenko 6ecd2ba352 Merge branch 'amd-master-next' into amd-npi-next
Change-Id: I53f9c054e5df19bd8b130e7610d71b91d525474a


[ROCm/clr commit: d078dab53b]
2020-09-10 11:31:46 -04:00
Rahul Garg 977c59d511 Fix dependency on rocm-dkms pkg
SWDEV-249463- hipcc can't find the rocm_agent_enumerator

Change-Id: I768a0d09753047508734d8360eb3d154edc0b0ef


[ROCm/clr commit: 9db9bed960]
2020-09-03 03:30:59 -04:00
Jenkins 88a7b6a0e6 Merge 'amd-master-next' into 'amd-npi-next'
Change-Id: I914aa748c92849f9f7ab796129a4617753d728db


[ROCm/clr commit: ee490fae12]
2020-08-25 11:10:53 -04:00
Yaxun (Sam) Liu dfbec234db Fix hipcc for extracing clang version
On teamcity clang --version returns something like

clang version 12.0.0
Target: x86_64-unknown-linux-gnu

currently hipcc does not handle it correctly since [^ ] causes new line and Targe:
matched. \S will make sure only version string matched.

Change-Id: I3659d6daf89b709d2b001e6b8024d69d8b79efc0


[ROCm/clr commit: 5e5fb829ed]
2020-08-21 18:21:46 -04:00
Jenkins 1158db8bee Merge 'amd-master-next' into 'amd-npi-next'
Change-Id: I935fc8f681fad2df4e932407287a29a6a797351a


[ROCm/clr commit: e1af6830ad]
2020-08-14 09:09:52 +00:00
Yaxun (Sam) Liu 1ca3e4696e Let hipcc not escape space between obj files extracted from library
hipcc extracts bundles from static libraries and pass them to clang. It should
not escape spaces between objects extracted from library.

Fixes: SWDEV-246544
Change-Id: Iad3902f28a43a3986917ee37a49f10382c329940


[ROCm/clr commit: c1a498c219]
2020-08-07 09:34:27 -04:00
Rahul Garg 47c57a5a82 Remove libhip_hcc symlinks to libamdhip64
Change-Id: I7b5b47fc7ca9760316c2424c16b454d7919c665c


[ROCm/clr commit: c919a88795]
2020-07-27 23:58:29 +00:00
Tao Sang 25c98ea4de Support numa if libnume-dev is installed
Let rocclr decide numa dependence

Change-Id: I65bdfba7ec0d06b550f86632318bcfd1f765cfa9


[ROCm/clr commit: eba78710dc]
2020-07-22 08:55:28 -04:00
Vlad Sytchenko a5869e453d Merge branch 'amd-master-next' into amd-npi-next
Change-Id: Id241c60d6c2ceb4049c3ec15d9fe06baf28bcb3a


[ROCm/clr commit: 6be1b7ce2b]
2020-07-20 09:49:15 -04:00
Ashutosh Mishra 65cce73afe Adapting to static libaray changes for hipcc
Since the introduction of BUILD_SHARED_LIBS there is only one target created : libamdhip64
Which is static ( libamdhip64.a ) or Dynamic ( libamdhip64.so ) depending on whichever it is
being compiled for. After this change we do not have any target libamdhip64_static which is
mentioned in the hipcc for linking. Hence cleaning the same.

Change-Id: Ia45c145e17b111b3f6a32299a11962b10f1cc539


[ROCm/clr commit: 7d3d8c8e6d]
2020-07-17 14:42:07 -04:00
Michael LIAO 8ad59be46d [hipcc] Only add -x hip on HIP-Clang compilation.
Change-Id: I19704c713ad00f92196d7586498e62f80b8cd177


[ROCm/clr commit: b39195b639]
2020-07-06 15:16:51 -04:00
Tao Sang b702f41277 Support numa policy set by user
Add hipHostMallocNumaUser flag to hipHostMalloc() in order to support
numa policy set by user.

Change-Id: I6d70ed539a5f97f27187f2242b68849c0e27e4d6


[ROCm/clr commit: 71c64e98a0]
2020-06-19 21:23:58 -04:00
Jenkins 52c76fcd97 Merge 'amd-master-next' into 'amd-npi-next'
Change-Id: Id0bd0798c460b51653a73b6a9ce97ddaec92874a


[ROCm/clr commit: 5068e1d87a]
2020-06-16 21:09:56 +00:00
Vlad Sytchenko b9efee6df8 Revert "Let hipcc not pass -mllvm option to HIP-Clang on Windows"
This reverts commit 23a8dfc8f3.

Change-Id: If29906b9c63f03d6e51144f510d3a956d90935e8


[ROCm/clr commit: e82e9355f2]
2020-06-11 16:36:48 -04:00
Siu Chi Chan 3d7612af8d fix uninitialized value in hipcc
Change-Id: I90b070c491f0efc328fcf97de0e111658ec772de


[ROCm/clr commit: 32f3374af9]
2020-06-10 16:07:51 -04:00
Yaxun (Sam) Liu 0d8425ee5a Fix include path and wrapper header
Currently std::complex and some other std functions require uses to
include hip_runtime.h before any other headers to work, which is not
reliable.

changes are made in clang to fix this issue:
https://reviews.llvm.org/D81176

which requires hipcc and HIP headers to make corresponding changes.

This patch will make sure the clang change will not break
HIP/ROCclr during this transition.

After the transition is done, we can remove explicitly setting
include path for HIP-Clang and HIP header in hipcc and hip config
cmake files and rely on clang driver to set it automatically.

Change-Id: I5d226861c2560ffa6c5ab17343a43cc378048061


[ROCm/clr commit: 0a513d8a02]
2020-06-09 17:37:20 -04:00
kjayapra-amd c73aabb05c FEAT-30999 - Add gfx90a support in npi.
Change-Id: Iabd36196e25be441bb816d5bab7a829911507169


[ROCm/clr commit: f1555d5fe0]
2020-06-08 13:49:03 -04:00
Aaron En Ye Shi b2f9e1c299 Add compiler-rt library for __fp16 and _Float16
Similar to HCC, link with compiler-rt to support __fp16 and _Float16 type conversions in ONNX models. This should resolve SWDEV-238491.

Change-Id: Iad8dcff568831719f501f562a04023326ae8036c


[ROCm/clr commit: d93134e727]
2020-06-03 18:53:14 +00:00
Siu Chi Chan 85d781ba65 update device library path
fix device lib directory

add missing --hip-link switch for link phase

Change-Id: I4b2eeb32648ca3cec72ec1f4e3381ce1fc0a90a5


[ROCm/clr commit: c414c70e8f]
2020-06-03 14:44:23 -04:00
kjayapra-amd 4afb215e53 FEAT-30761 - Adding gfx1031 to known targets in hipcc on amd-npi-next branch
Change-Id: I0f7fb414d53bd83087681ddb4e6a86802ba3c3ba


[ROCm/clr commit: 426d1d2c28]
2020-06-03 12:54:51 -04:00
Vlad Sytchenko ffe369761e Merge branch 'amd-master-next' into amd-npi-next
Change-Id: I75be5fbe5ddd6552a6a316ec99ca8833ee02cb6c


[ROCm/clr commit: e0009cdbec]
2020-05-21 19:17:10 -04:00
Christophe Paquot dcf54124a1 [hip] Skip lang guess if -x <lang> is specified.
Change-Id: If5cbdd1e5d36d2d8b83f3eadd0598162691167aa


[ROCm/clr commit: 4932115d6d]
2020-05-15 17:07:40 -04:00
Vlad Sytchenko f7c1b0aa65 Merge branch 'amd-master-next' into amd-npi-next
Change-Id: Ie692324c8cf6215bf6cf87de0d5e3aa1bdfd5ea1


[ROCm/clr commit: ef87227a3f]
2020-05-15 11:15:27 -04:00
Payam f08d09ddba updating envar to HIP_ROCCLR_HOME
Change-Id: Ic0bbf40638538307377e6db1a7379fb23dec8306


[ROCm/clr commit: 4638f0f11c]
2020-05-14 12:59:51 -04:00
Icarus Sparry 5be7627c16 Fix runtime failure on windows
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>
Change-Id: I6c991a943e04ef29eff2905becbed0038c3b8ab9
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>


[ROCm/clr commit: 3c855b543a]
2020-05-11 17:30:47 -04:00
Icarus Sparry 2afdba7819 Correct quoting of arguments
The hipcc script takes arguments and uses this to build up a new
command. Characters which are special to the shell need to be quoted
to prevent them being interpreted.

In particular adding
     --Wl,--enable-new-dtags -Wl,--rpath,'$ORIGIN:$ORIGIN/../lib'
to the command should pass quoted dollar signs into the resulting
string so the shell passes them on, rather than substituting the
values.

The arguments are processed in a conventional loop, but can be altered
during the course of the loop, and also by linker response files.

Tested by running
  HIPCC_VERBOSE=7 HIP_COMPILER=clang hipcc --cxxflags \
      fred.c -Wl,,--rpath,'$ORIGIN:$ORIGIN:/../lib'
and observing "-Wl,--rpath,\$ORIGIN\:\$ORIGIN\:..\/lib" in the
displayed hipcc-cmd output (and ignoring the errors due to rocm not
being installed)

Change-Id: I26b62f09ff3518cceeb85fa8823bb12a95c1c78e
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>


[ROCm/clr commit: 9f31801831]
2020-05-10 18:16:48 -04:00
agodavar 786203246c SWDEV-234447:Fix error Use of uninitialized value in concatenation (.)
Change-Id: Ia6f8d23f100826438f152c175d10ac3096ee024e


[ROCm/clr commit: e069cf6511]
2020-05-08 12:07:24 -04:00
Aaron Enye Shi 1c669b3028 SWDEV-234954 - Fix hipconfig on Windows
Before setting the HIP_RUNTIME and HIP_COMPILER variables, first check the environment if these are set. We should prioritize the environment settings. For windows, it will be set, and also explicitly call perl when invoking hipconfig.

Change-Id: I89ad267285239e6d8a897dc681c4af5906e7b9d8


[ROCm/clr commit: c70a32c5a7]
2020-05-08 13:27:36 +00:00
Vlad Sytchenko 605fd9cc66 Merge branch 'amd-master-next' into amd-npi-next
Change-Id: Id97c6b8c875731250049a5b9dc8062311ae291ad


[ROCm/clr commit: 10bf21829c]
2020-05-07 17:17:21 -04:00
Aaron Enye Shi 6f14391a04 Fix missed VDI names in hip-on-rocclr
Change-Id: I830feb37a043656136648e92a0c6f1eaae8402d7


[ROCm/clr commit: 88ce9d5a10]
2020-05-07 08:37:28 -04:00
Rahul Garg b6c8a14323 Remove HIP_MARKER left overs due to HIP PR 2032
Change-Id: Ieae68dd3b12c92b1d6830619ca4c6ae43c400225


[ROCm/clr commit: 4c05fd9d4c]
2020-05-06 20:26:18 -04:00
Payam 082b9e51ab name change vdi to rocclr
Change-Id: I06d198bbb4a499e153b290b73a92afed3553b252


[ROCm/clr commit: dba0e72de2]
2020-05-06 09:14:30 -04:00
Yaxun (Sam) Liu 094472b32d Fix hipcc for -E
-E is for preprocessing only, which should be compile only.

This is required by enabling sccache.

Change-Id: Ia0a0acb6a04abd03a9cb5b3c13cf7446837f37b4


[ROCm/clr commit: 48d89d670e]
2020-05-05 14:30:25 -04:00
Aaron Enye Shi a5441b7c97 Update hipcc to use HIP_COMPILER variable
This will update the hipcc script so that it will use HIP_PLATFORM, HIP_COMPILER, and HIP_RUNTIME variables correctly based on updated hipconfig file.

Removing HIP_PLATFORM=clang, only use hcc and nvcc for now. HIP_PLATFORM should eventually switch to amd or nvcc.

Change-Id: Ie527d07a1add974cc3aab8e9f61b0518147d7602


[ROCm/clr commit: c729d52681]
2020-04-30 15:31:20 -04:00
Vlad Sytchenko a11a651248 Merge branch 'amd-master-next' into amd-npi-next
Change-Id: Icd651e93f0c28eb2859f4997377379d0698ce84e


[ROCm/clr commit: e97809ca7a]
2020-04-29 18:54:58 -04:00
Aaron Enye Shi b1904716e1 Update hipconfig to support HIP-Clang
Add support for hipconfig to display details on HIP-Clang compiler and update HIP_COMPILER and HIP_RUNTIME to include clang and rocclr. Also, add hipcc flags --cxxflags and --ldflags to support HCC users who used hccconfig flags.

Change-Id: Ib12d81a4ff59d34fb000626836b1adb10be3ac61


[ROCm/clr commit: 2df5d92240]
2020-04-27 11:44:53 -04:00
Yaxun (Sam) Liu 6b0c1024c2 Let hipcc treats .cpp files as C++ files for HIP-Clang
This change is required by rocBLAS and rocFFT for OpenMP issue
since cmake needs to treat .cpp file as C++ program to detect
OpenMP support.

This is to match nvcc behavior, speed up compilation of C++
programs, and fix some compilation issue where C++ programs
are compiled as HIP programs.

Currently it is controlled by an environment variable
HIP_COMPILE_CXX_AS_HIP. By default it is 1, where
hipcc treats .cpp files as HIP programs. If it is
set to 0, hipcc will treat .cpp files as C++ programs.
This is because some math libraries are still not
ready for the change, however rocBLAS and rocFFT
require this feature for OpenMP, therefore put it
under an environment variable so that rocBLAS
and rocFFT can use it.

Change-Id: I56a51e27079df850ee39d4217fb647c22d79f612


[ROCm/clr commit: 4e7b1cdbd2]
2020-04-27 11:43:05 -04:00
root 6a7aa0c1c6 Merge master into amd-master-next
Change-Id: I3fc1dc0c860d627053537581e75561e8a7efe327


[ROCm/clr commit: b5031f39b1]
2020-04-26 22:19:37 +00:00
Maneesh Gupta 11fe5b06de Merge in the rocclr based hip runtime (#2032)
* Merge master-next changes in master (include vdi development in master branch)



[ROCm/clr commit: f2e1118d7a]
2020-04-23 09:12:06 -07:00
Tao Sang eb50c7ef38 Solve issues with hip-vdi runtime static lib
1.Combine libamdhip64_static_base.a and libamdvdi_static.a into libamdhip64_static.a.
2.Let hipcc use -use-staticlib to link libamdhip64_static.a.
3.Add some samples for static lib.
4.Fix compiling failure of code object.

Change-Id: Ic8c95228eb139058da8b5d66ba8439486154ca6f


[ROCm/clr commit: 32130f8ec3]
2020-04-20 15:37:02 -04:00
Tao Sang efe517e4c0 Revert "Solve issues with hip-vdi runtime static lib"
This reverts commit 08d1b39d50.

Reason for revert: It is causing dkms-no-npi-hipclang broken.
It is top priority to maintain dkms-no-npi-hipclang build, otherwise we lose track of regression analysis.
So revert the change for now and recommit it after fixing it.

 

Change-Id: Ia5136e888baecb6148c6c18eedbf37066fcb1eaa


[ROCm/clr commit: a6c6f51926]
2020-04-17 10:13:08 -05:00
Tao Sang 08d1b39d50 Solve issues with hip-vdi runtime static lib
1.Combine libamdhip64_static_base.a and libamdvdi_static.a into libamdhip64_static.a.
2.Let hipcc use -use-staticlib to link libamdhip64_static.a.
3.Add some samples for static lib.
4.Fix compiling failure of code object.
Change-Id: Ia2333622a8d05639b90974c4c5d3d85654ba0138


[ROCm/clr commit: 5210ee6ca5]
2020-04-15 13:46:36 -04:00
kjayapra-amd 011eb7a11c SWDEV-227890 - Adding support for gfx1030 in amd-npi.
Change-Id: I3cb2bdf7915e251fce9efeb8b156c8947704ca93


[ROCm/clr commit: 2e5d3b6ade]
2020-04-15 09:59:59 -04:00
Maneesh Gupta e5ee180568 Merge branch 'amd-master' into amd-master-next
Change-Id: I3094c15008093f2072bcd38aca4ea90aeae2d97b


[ROCm/clr commit: 0ea6697192]
2020-04-09 06:31:00 -04:00