Commit-Graf

48 Incheckningar

Upphovsman SHA1 Meddelande Datum
ROCm CI Service Account 435d824582 SWDEV-291455 - File Reorganization with backward compatibility (#2555)
Related changes for HIP installation in /opt/rocm
Setting HIP_PATH and ROCM_PATH
Setting INTERFACE directories

Depends-On: If70b61020fa3ee85bf49171c842837da05191a48
Change-Id: I30adccf7e6241dae12270156602d4b033ea99d93


[ROCm/hip commit: a296100da7]
2022-03-17 15:35:13 -07:00
ROCm CI Service Account fbb703087a SWDEV-273235 - build hip samples in Windows (#2513)
Change-Id: I90f06ef058a3a8b54726b86d72f36b2ba7f94d4c

[ROCm/hip commit: 73b520a2e0]
2022-02-24 16:39:07 +05:30
agunashe a4ff63a29b SWDEV-293742 - Update copyright end year
Change-Id: I2cb7bbd9a6d9da28116ba9dd9cec4e60525444e2


[ROCm/hip commit: d529637fbc]
2021-07-07 12:57:23 -04:00
Vladislav Sytchenko d9348d9b63 SWDEV-273235 - Initial support for Windows CMake
This change is tied to the ROCclr cmake rework. ROCclr will now be built
as part of HIP itself.

All the dependencies on comgr and rocr have been moved into ROCclr
itself. This allows HIP to pull in all the required compiler/runtime
dependencies by simply linking against ROCclr. Note that ROCclr needs to
be configured from HIP cmake command line. If not, we will default to
LC + ROCr support.

Since HIP depends on ROCclr and ROCclr depends on OpenCL, HIP will
transitevly pull in all the required OpenCL headers. No need to keep a
local copy of them anymore.

Change-Id: Ib39f4929e88da1248be962490c150b10fc7abd3a


[ROCm/hip commit: 30f1fcaf53]
2021-05-27 15:21:05 -04:00
Jatin Chaudhary 2c94fc9b42 SWDEV-279372 - HIP_CLANG_PATH should resolve from HIP_PATH if its defined
Change-Id: Iee909f1e2f3d6443b494846219ad955a1f0ebfe8


[ROCm/hip commit: 6e42b3f71c]
2021-03-31 00:31:45 -04:00
Tao Sang 0604a66dbc 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/hip commit: 2152cc1b3d]
2021-03-02 09:48:00 -05:00
Tao Sang ec1f689600 SWDEV-270973 - Add missing copyright headers
Change-Id: I6bb27650f74372dae6e29c79fd6bb2022cc062fe


[ROCm/hip commit: b504a9bfae]
2021-03-01 19:46:24 -05:00
Tao Sang 2820f91c90 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/hip commit: b34dd95124]
2021-01-08 10:53:34 -05:00
Jatin Chaudhary 19e55e5536 Populate HIP_CLANG_PATH if its not declared
Change-Id: Ibc1f2e9b3389b6cc7a58579cfb293999ad6e9398


[ROCm/hip commit: 12063cfc45]
2021-01-07 04:15:42 -05:00
Tao Sang fd5ef38166 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 4a8a95a8e9.

Change-Id: I918eeae94487e5e2ff5bfde083667ac65fb6e702


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


[ROCm/hip commit: d10124e1d7]
2020-10-21 07:26:14 -04:00
Tao Sang 4a8a95a8e9 Revert "Make directed_test support static libs"
This reverts commit 37282c6132.

Reason for revert: <INSERT REASONING HERE>

Change-Id: Ib2d1084ea21461f70f96f95c6025a08f88288357


[ROCm/hip commit: 5b7533e49f]
2020-10-12 00:01:13 -04:00
Tao Sang 37282c6132 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/hip commit: b41a769517]
2020-10-08 22:46:58 -04:00
Rahul Garg 51829c1d34 Support empty sources in add_executable and add_library
Change-Id: I1441f2c045aeda2bba99bffe1c99fcc4a59cea9b


[ROCm/hip commit: 3abb559f72]
2020-07-30 13:34:46 -04:00
Aaron En Ye Shi 5ef8eb7375 HIP-Clang Temporarily include HIP_HCC_FLAGS for PyT
Change-Id: I0f5895fba69f5bf0c6cc13e9402bdc44726dcc5a


[ROCm/hip commit: 13ac055fc2]
2020-06-01 15:28:04 -04:00
agodavar 8760f75135 SWDEV-235875:Fix rocALUTION build error
Change-Id: I2f2a15687e943a860ff6ca05f22422f791a36c0a


[ROCm/hip commit: 07419c7635]
2020-05-14 14:43:25 -04:00
Vlad Sytchenko 969c3284fb Correctly check if env vars are set
Change-Id: I365da786c822e9395aec5c6b75753ba297da3f64


[ROCm/hip commit: a45085f9b9]
2020-05-13 14:08:03 -04:00
agodavar 013d40cfff SWDEV-233749 Added support for parallel build and link
Change-Id: Id227ea1fe7574612c33a8e6d91fc59a29490a35f


[ROCm/hip commit: 56691fe7e6]
2020-05-06 14:54:39 -04:00
agodavar 41a1bb6733 find_package(hip) changes for clang
Change-Id: I9dc1be1dd5f9424e26ebcd2961207e1c4467550f


[ROCm/hip commit: 1468982f8a]
2020-05-01 20:48:32 +00:00
Maneesh Gupta 4e1f6f2a0e Merge branch 'amd-master' into amd-master-next
Change-Id: I3094c15008093f2072bcd38aca4ea90aeae2d97b


[ROCm/hip commit: 2af31479e2]
2020-04-09 06:31:00 -04:00
Laurent Morichetti bc78a8529d Merge branch 'origin/pghafari/hip-vdi' into lmoriche/amd-master-next
Change-Id: I22c145d39f430ca571a981687bcb034ea6e3b8a2


[ROCm/hip commit: a8b81e96b4]
2020-01-31 07:33:12 -08:00
paulfreddy e47b0a4152 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/hip commit: 3bc69394d0]
2020-01-21 14:17:35 +05:30
Matthias Werner ab8e3c2504 Fixes build-name bug due to reversed string() arguments in cmake.
[ROCm/hip commit: bbfda64813]
2018-08-27 17:51:12 +02:00
Maneesh Gupta 24f1302090 Merge pull request #588 from Jorghi12/patch-10
Fixing a HIP bug that causes DEBUG symbols to be dropped.

[ROCm/hip commit: 56126838cc]
2018-08-03 08:48:56 +05:30
Maneesh Gupta 92eaeabe99 [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/hip commit: 36c7670293]
2018-07-25 15:32:14 +05:30
Jorghi12 54bf67ff22 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/hip commit: 865b015410]
2018-07-23 18:16:00 -04:00
Maneesh Gupta d8ef72da10 Fix typo in FindHIP.cmake
[ROCm/hip commit: 9e2d33c866]
2018-07-23 10:39:45 +05:30
Jorghi12 11cfca95ab Update FindHIP.cmake
Using Bool expression to handle empty case.

[ROCm/hip commit: 2b6a736318]
2018-07-18 23:02:11 -04:00
Jorghi12 6c0d113bba Update FindHIP.cmake
Adding another flag.

[ROCm/hip commit: 584e61b9f3]
2018-07-12 14:17:21 -04:00
Jorghi12 25b5ce36c9 Update FindHIP.cmake
Updating placement.

[ROCm/hip commit: 341c7c4019]
2018-07-12 13:56:08 -04:00
Jorg Doku e68dc0ccbd Support INCLUDE_DIRECTORIES & COMPILE_DEFINITIONS
[ROCm/hip commit: bfb03ca86c]
2018-07-11 16:13:07 -04:00
pradeepisro 4c9fad371f added option HIP_BUILD_VERBOSE to enable verbosity in HIP build
[ROCm/hip commit: f6938961b9]
2018-06-19 13:50:24 +05:30
pradeepisro 1eb91f1bab added changes to FindHIP.cmake which would allow us to build using ninja #467
[ROCm/hip commit: 4f0aefbd63]
2018-06-19 12:26:18 +05:30
Junjie Bai 53a09e7bb8 Properly handle (empty) cmake generator expression
[ROCm/hip commit: 03d3c6eaed]
2018-06-12 23:53:18 -07:00
Yifan Sun 8db7ef071d Allow hip cmake to link libraries
[ROCm/hip commit: 0aaa800109]
2017-07-27 11:46:18 -04:00
Maneesh Gupta bed0375e99 Merge branch 'amd-develop' into amd-master
Change-Id: I312fb9d1181733ef5160d1e993e2ae57ced0f6b3
(cherry picked from commit f884e55aca)


[ROCm/hip commit: 5433d17e2e]
2017-04-25 00:01:30 -04:00
Maneesh Gupta d898444c44 FindHIP: better handling for custom HCC_HOME
Change-Id: Ica267de11cde58d1e759cd1fd053b699649ea76a


[ROCm/hip commit: 12e8d635aa]
2017-03-07 14:40:04 +05:30
Maneesh Gupta 09da9ae434 FindHIP: added new macro HIP_RESET_FLAGS
Change-Id: I0af491f6689abf1c1b5691261fe1f3e61a5d916d


[ROCm/hip commit: 470dd2fbcf]
2017-02-27 13:11:11 +05:30
Maneesh Gupta e66fad9e3d FindHIP: Fix bug in parsing source files and options
Change-Id: Ib1c793dd19d61b387da3f5894c4e37c66f02b753


[ROCm/hip commit: 067ea6cc4c]
2016-09-20 20:46:49 +05:30
Maneesh Gupta a6967b58a2 FindHIP: Fix bug in handling HIP_SOURCE_PROPERTY_FORMAT
Change-Id: I6f19c487b222039e2653a8de1930c02da64318ed


[ROCm/hip commit: 80f75f4677]
2016-09-20 14:03:51 +05:30
Maneesh Gupta 60a81dddfb FindHIP: Fix formatting issues
Change-Id: I169266fe34fec1d0619b299733e9997eddc16d90


[ROCm/hip commit: 1793a7160c]
2016-09-20 12:53:55 +05:30
Maneesh Gupta bce29635c2 FindHIP: Initial support for HIP_ADD_LIBRARY
Change-Id: Ic8b93c2a9daff2dddb3a94b62981d3a1f03afd5c


[ROCm/hip commit: a4c4be2020]
2016-09-16 10:17:27 +05:30
Maneesh Gupta 2afa7480fb FindHIP: determine HIP_PLATFORM at build time instead of compile time
Change-Id: Icb99d23f2874c4c15771641d7e3e91bb5c918f27


[ROCm/hip commit: 2674204ade]
2016-09-16 10:16:34 +05:30
Maneesh Gupta 67d6f9a803 FindHIP: don't clobber CXX linker and fix some typos
Change-Id: Ie92e9d7c212491ce54f0709d291fafaeb1c479de


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

Change-Id: Ia8e25e371e17f8b4207b99e3fdfb575e59c2ebf2


[ROCm/hip commit: 75af21952c]
2016-09-05 09:30:16 -05:00
Maneesh Gupta df654fa623 FindHIP: First version of re-implementation
Change-Id: I84332a0f7d89271bf9370dbcd19d893119e738f9


[ROCm/hip commit: b0621a4794]
2016-09-02 15:07:33 +05:30
Maneesh Gupta 32e35b671d Replace /opt/hcc -> /opt/rocm/hcc and /opt/hsa -> /opt/rocm/hsa
[ROCm/hip commit: 5a31bad821]
2016-04-15 12:56:31 +05:30
Ben Sander 97cf8b8ac9 Initial commit for GPUOpen Launch
[ROCm/hip commit: f38e63ff18]
2016-01-26 20:14:33 -06:00