Commit Graph

44 Commits

Author SHA1 Message Date
Jatin Chaudhary f4f119792a SWDEV-279372 - HIP_CLANG_PATH should resolve from HIP_PATH if its defined
Change-Id: Iee909f1e2f3d6443b494846219ad955a1f0ebfe8


[ROCm/clr commit: 32498b61ff]
2021-03-31 00:31:45 -04:00
Tao Sang f6a1072ffe SWDEV-274307 - Send NVCC_OPTIONS to linker
Flags of NVCC_OPTIONS need be sent to linker. Because compiler and
linker flager are mixed in NVCC_OPTIONS.

Change-Id: I3db37b962808566ea145e3cbdefa66d373e2d360


[ROCm/clr commit: f727a048d3]
2021-03-02 09:48:00 -05:00
Tao Sang 2a6f45533d SWDEV-270973 - Add missing copyright headers
Change-Id: I6bb27650f74372dae6e29c79fd6bb2022cc062fe


[ROCm/clr commit: 4048db950c]
2021-03-01 19:46:24 -05:00
Tao Sang eeb275d643 Remove hip-hcc codes: Part four
Remove __HCC__, __HCC_ONLY__, __HCC_CPP__, __HCC_C__,
__HCC_OR_HIP_CLANG__, __HIP_ROCclr__ and their guarded codes.

Remove Hcc codes from directed_tests and samples.

Remove __HIP_PLATFORM_HCC__ and __HIP_PLATFORM_NVCC__ from
some files where they are not necessary.

Add deprecation notice.

Change-Id: I1ae467eafd749d6c25bca204c1724b026be21fce


[ROCm/clr commit: d504a761ad]
2021-01-08 10:53:34 -05:00
Jatin Chaudhary e91e6ccbfc Populate HIP_CLANG_PATH if its not declared
Change-Id: Ibc1f2e9b3389b6cc7a58579cfb293999ad6e9398


[ROCm/clr commit: 9e35810188]
2021-01-07 04:15:42 -05:00
Tao Sang d8e8f2c833 Make directed_test support static libs
1.Make directed_test apps linked against static libs
    of hip, rocclr, rocr, roct and amd_comgr.
    2.Remove custom_target amdhip64_static_combiner.
    3.Support EXCLUDE_HIP_LIB_TYPE <static|shared>.
    4.Simplify argument list parsing.
    5.Install rocclr when rocm is installed.
    6.Fix some original small bugs.

Revert "Revert "Make directed_test support static libs""
This reverts commit f1cc6bef64.

Change-Id: I918eeae94487e5e2ff5bfde083667ac65fb6e702


[ROCm/clr commit: 6db4976759]
2020-10-26 12:39:58 -04:00
agodavar 9132d92ccd cmake hip-rocclr as default build,change HIP_PLATFORM to amd|nvidia
Change-Id: I59d2e15b297b6ca2d5eee1a6dee642bdb01a3839


[ROCm/clr commit: 8717a78bf7]
2020-10-21 07:26:14 -04:00
Tao Sang f1cc6bef64 Revert "Make directed_test support static libs"
This reverts commit a47392be9b.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ib2d1084ea21461f70f96f95c6025a08f88288357


[ROCm/clr commit: 0d1cf31eb1]
2020-10-12 00:01:13 -04:00
Tao Sang a47392be9b Make directed_test support static libs
1.Make directed_test apps linked against static libs
of hip, rocclr, rocr, roct and amd_comgr.
2.Remove custom_target amdhip64_static_combiner.
3.Support EXCLUDE_HIP_LIB_TYPE <static|shared>.
4.Simplify argument list parsing.
5.Fix hip_pch.o missing issue in samples' build.
6.Fix some original small bugs.

Change-Id: I30f5e65367613152ce86b80b13e1c9f2a28da803


[ROCm/clr commit: 36c5679efc]
2020-10-08 22:46:58 -04:00
Rahul Garg ce2da5238a Support empty sources in add_executable and add_library
Change-Id: I1441f2c045aeda2bba99bffe1c99fcc4a59cea9b


[ROCm/clr commit: e3617167f5]
2020-07-30 13:34:46 -04:00
Aaron En Ye Shi d2bcb05dfb HIP-Clang Temporarily include HIP_HCC_FLAGS for PyT
Change-Id: I0f5895fba69f5bf0c6cc13e9402bdc44726dcc5a


[ROCm/clr commit: a436ab865a]
2020-06-01 15:28:04 -04:00
agodavar 2d90f030a1 SWDEV-235875:Fix rocALUTION build error
Change-Id: I2f2a15687e943a860ff6ca05f22422f791a36c0a


[ROCm/clr commit: 945726f870]
2020-05-14 14:43:25 -04:00
Vlad Sytchenko 0274913d05 Correctly check if env vars are set
Change-Id: I365da786c822e9395aec5c6b75753ba297da3f64


[ROCm/clr commit: 5067cd1dd1]
2020-05-13 14:08:03 -04:00
agodavar 2c12eb85a1 SWDEV-233749 Added support for parallel build and link
Change-Id: Id227ea1fe7574612c33a8e6d91fc59a29490a35f


[ROCm/clr commit: ba2991a38a]
2020-05-06 14:54:39 -04:00
agodavar 7da11623bd find_package(hip) changes for clang
Change-Id: I9dc1be1dd5f9424e26ebcd2961207e1c4467550f


[ROCm/clr commit: ce8a5af666]
2020-05-01 20:48:32 +00: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
Laurent Morichetti 540a8d6337 Merge branch 'origin/pghafari/hip-vdi' into lmoriche/amd-master-next
Change-Id: I22c145d39f430ca571a981687bcb034ea6e3b8a2


[ROCm/clr commit: 2f1305b9a4]
2020-01-31 07:33:12 -08:00
paulfreddy c9c4645328 Changes for multiple ROCm installation (#1771)
* FBA-29, FBA-69, multiple rocm support, shared library conflicts
Changes to resolve:
1) Multiple rocm release installation support
2) Multiple rocm shared lib conflicts
3) Add the so versioning also

[ROCm/clr commit: c5ed5c71a3]
2020-01-21 14:17:35 +05:30
Matthias Werner c0bdab78aa Fixes build-name bug due to reversed string() arguments in cmake.
[ROCm/clr commit: f7f7140053]
2018-08-27 17:51:12 +02:00
Maneesh Gupta 34e14adae2 Merge pull request #588 from Jorghi12/patch-10
Fixing a HIP bug that causes DEBUG symbols to be dropped.

[ROCm/clr commit: ac18a3b701]
2018-08-03 08:48:56 +05:30
Maneesh Gupta 34bd297a65 [FindHIP] Remove rdynamic from CMAKE_SHARED_LIBRARY_LINK_HIP_FLAGS
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS contains -rdynamic which does not go
well with nvcc

Change-Id: I10e6d21553de0e43c6a7ae5fb3ec2418087959ff


[ROCm/clr commit: 7a5987e289]
2018-07-25 15:32:14 +05:30
Jorghi12 1f5303c7c3 Fixing a HIP bug that causes DEBUG symbols to be dropped.
I've noticed that in the generated makefiles, we'd have 

if(NOT build_configuration)
    set(build_configuration Debug)
endif()

However, only definitions with all capitals are provided. 

e.g.

set(HIP_HCC_FLAGS_DEBUG -g)

This is because of lines 442 to 448. We capitalize the configuration ${config_upper}.

This PR fixes this bug.

[ROCm/clr commit: 25c780c89e]
2018-07-23 18:16:00 -04:00
Maneesh Gupta e858a79470 Fix typo in FindHIP.cmake
[ROCm/clr commit: 4637e11a24]
2018-07-23 10:39:45 +05:30
Jorghi12 a05aa9d71f Update FindHIP.cmake
Using Bool expression to handle empty case.

[ROCm/clr commit: 4abcf5dbc4]
2018-07-18 23:02:11 -04:00
Jorghi12 c4c42ce685 Update FindHIP.cmake
Adding another flag.

[ROCm/clr commit: 1e5552f861]
2018-07-12 14:17:21 -04:00
Jorghi12 89c3f89603 Update FindHIP.cmake
Updating placement.

[ROCm/clr commit: a484f89b34]
2018-07-12 13:56:08 -04:00
Jorg Doku 8b71bcc45f Support INCLUDE_DIRECTORIES & COMPILE_DEFINITIONS
[ROCm/clr commit: 7383eac88a]
2018-07-11 16:13:07 -04:00
pradeepisro 64b4f4101f added option HIP_BUILD_VERBOSE to enable verbosity in HIP build
[ROCm/clr commit: bdfd6957aa]
2018-06-19 13:50:24 +05:30
pradeepisro cd9a2cbe42 added changes to FindHIP.cmake which would allow us to build using ninja #467
[ROCm/clr commit: 6bdb5f3541]
2018-06-19 12:26:18 +05:30
Junjie Bai 3a79e00741 Properly handle (empty) cmake generator expression
[ROCm/clr commit: 704f8c7b8f]
2018-06-12 23:53:18 -07:00
Yifan Sun 1edab9f118 Allow hip cmake to link libraries
[ROCm/clr commit: 679075e2f0]
2017-07-27 11:46:18 -04:00
Maneesh Gupta 21663a6f4a Merge branch 'amd-develop' into amd-master
Change-Id: I312fb9d1181733ef5160d1e993e2ae57ced0f6b3
(cherry picked from commit 88fb807af0)


[ROCm/clr commit: 1e404bfb14]
2017-04-25 00:01:30 -04:00
Maneesh Gupta 928832a432 FindHIP: better handling for custom HCC_HOME
Change-Id: Ica267de11cde58d1e759cd1fd053b699649ea76a


[ROCm/clr commit: 90478d90d4]
2017-03-07 14:40:04 +05:30
Maneesh Gupta f109c9e6da FindHIP: added new macro HIP_RESET_FLAGS
Change-Id: I0af491f6689abf1c1b5691261fe1f3e61a5d916d


[ROCm/clr commit: 58272083dd]
2017-02-27 13:11:11 +05:30
Maneesh Gupta a11bf35903 FindHIP: Fix bug in parsing source files and options
Change-Id: Ib1c793dd19d61b387da3f5894c4e37c66f02b753


[ROCm/clr commit: 6b9d8e85a7]
2016-09-20 20:46:49 +05:30
Maneesh Gupta 9cdba6fcdf FindHIP: Fix bug in handling HIP_SOURCE_PROPERTY_FORMAT
Change-Id: I6f19c487b222039e2653a8de1930c02da64318ed


[ROCm/clr commit: 3e18b5fdf3]
2016-09-20 14:03:51 +05:30
Maneesh Gupta 585ed80005 FindHIP: Fix formatting issues
Change-Id: I169266fe34fec1d0619b299733e9997eddc16d90


[ROCm/clr commit: f9a9936c49]
2016-09-20 12:53:55 +05:30
Maneesh Gupta ae7c3ac338 FindHIP: Initial support for HIP_ADD_LIBRARY
Change-Id: Ic8b93c2a9daff2dddb3a94b62981d3a1f03afd5c


[ROCm/clr commit: 730268e087]
2016-09-16 10:17:27 +05:30
Maneesh Gupta 99dfaeec96 FindHIP: determine HIP_PLATFORM at build time instead of compile time
Change-Id: Icb99d23f2874c4c15771641d7e3e91bb5c918f27


[ROCm/clr commit: 2c3ce272e6]
2016-09-16 10:16:34 +05:30
Maneesh Gupta fe35c55b56 FindHIP: don't clobber CXX linker and fix some typos
Change-Id: Ie92e9d7c212491ce54f0709d291fafaeb1c479de


[ROCm/clr commit: b14e457a65]
2016-09-07 12:38:25 +05:30
Ben Sander bff88c9b4f Doc update.
- Add link to new driver porting guide.
- small typo

Change-Id: Ia8e25e371e17f8b4207b99e3fdfb575e59c2ebf2


[ROCm/clr commit: 0b54fd4527]
2016-09-05 09:30:16 -05:00
Maneesh Gupta 58a2e6086b FindHIP: First version of re-implementation
Change-Id: I84332a0f7d89271bf9370dbcd19d893119e738f9


[ROCm/clr commit: de24b6d228]
2016-09-02 15:07:33 +05:30
Maneesh Gupta 1293709fc0 Replace /opt/hcc -> /opt/rocm/hcc and /opt/hsa -> /opt/rocm/hsa
[ROCm/clr commit: cf4c3b0913]
2016-04-15 12:56:31 +05:30
Ben Sander 28f87a0428 Initial commit for GPUOpen Launch
[ROCm/clr commit: 304171c1a2]
2016-01-26 20:14:33 -06:00