Commit Graph

236 Commits

Author SHA1 Message Date
David Salinas a13ca05639 SWDEV-274114 - fix dependency issues for perl modules
Change-Id: I320d5fb50db3eecd433e81ab49703ca04c882711


[ROCm/hip commit: 444d14e654]
2021-03-04 16:52:35 -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
Zack Galbreath 17ca4ca8dc SWDEV-264220 - Provide CMake hip language configuration information
This provides the required information for CMake to bootstrap
HIP language and runtime support. In particular this file
is consumed by CMake during HIP compiler detection to
determine the required flags needed for compilation and
linking.

Initial design was discussed in #2158

Add copyright / license header

Change-Id: I10acb860bf6291b2deb6b678e6e916faa7c82c2a


[ROCm/hip commit: 8c90ab196b]
2021-02-10 08:26:35 -05:00
Tao Sang 138ac37a70 SWDEV-271363 - Fix undefined HIP_VERSION_GITDATE
HIP_VERSION_GITDATE won't be defined when git isn't
installed. This will lead to building failure of
deviceLib.hipVersion. When git isn't installed, set
HIP_VERSION_GITDATE as 0 by default.

Change-Id: Icf5763449ccec833d9efda90ffe3a86fb53bdb82


[ROCm/hip commit: 76d8ad1bf9]
2021-02-03 21:31:26 -05:00
Satyanvesh Dittakavi e33aeea2b2 SWDEV-269440 - Fix build error in HIP-CUDA path
Change-Id: Icf5763449ccec333d9efda90ffe3a86fb53bdb81


[ROCm/hip commit: e2551bd15c]
2021-02-02 05:40:31 -05:00
agodavar f399142b9e SWDEV-270198 - hip-hcc cleanup remove lpl_ca
Change-Id: I6cae9435397e9070efb4a953c7ba8bd3dcd98c0e


[ROCm/hip commit: 83482253ec]
2021-01-27 23:40:58 -05:00
David Salinas e7073fc17c add new code object tooling: roc-obj-ls and roc-obj-extract
SWDEV-229776

Change-Id: Icb11c4552515d3eff3bcf303c4a470ab90d1dd58


[ROCm/hip commit: cb859b7263]
2021-01-14 14:45:46 -05:00
Tao Sang c618b6aeff Remove hip-hcc codes: Part three
1.Rename include/hip/hcc_detail/ as include/hip/amd_detail/

2.Rename include/hip/nvcc_detail/ as include/hip/nvidia_detail/

3.Create __HIP_PLATFORM_AMD__ to replace __HIP_PLATFORM_HCC__

4.Create __HIP_PLATFORM_NVIDIA__ to replace __HIP_PLATFORM_NVCC__

After hcc_detail, nvcc_detail, __HIP_PLATFORM_HCC__ and __HIP_PLATFORM_NVCC__
have been removed from upstream, they will be removed from hip runtime.

Change-Id: I1ae457effd739d6c25bca203c1724b026be21fce


[ROCm/hip commit: c2adc70d4d]
2021-01-05 10:39:31 -05:00
Tao Sang 544f512353 Some improvements on hip cmake file
1.Fix unexpected repeated hip runtime lib building
2.Seperate test cmake from top cmake.

Change-Id: I1ae457effd639d6c25bca293c1724b026be21ecd


[ROCm/hip commit: d074c2491f]
2020-12-11 13:32:15 -05:00
Tao Sang 5d94d2ee98 Remove hip-hcc codes: Part one
Remove hip-hcc codes from hip code base
Simplify hip CMakeLists.txt to exclude hip-hcc
Simplify cmake cmd for hip-rocclr building
Some minor fixes

Change-Id: I1ae357ecfd638d6c25bca293c1724b026be21ecd


[ROCm/hip commit: 186f95ea30]
2020-12-09 15:49:47 -05:00
agodavar ead59333f5 SWDEV-249870: Generate Pre-Compiled Headers from includes in source repo for Online Compilation
Change-Id: I663f510603e983927f80f7944df4d039ba7bc0b0


[ROCm/hip commit: bf0b75baed]
2020-11-12 10:50:33 -05:00
agodavar 225b4f65be Fix building of tests on nvidia GPU
Change-Id: I02b527ec4135c79bb35cbbfe419211ec363cb065


[ROCm/hip commit: 4ef0f7a7c3]
2020-11-02 09:42:28 -05: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
Vladislav Sytchenko e428310a56 Change __HIP_ENABLE_PCH to be an option
Currently all the logic checks if __HIP_ENABLE_PCH is set, so setting it
to OFF will still enable PCH.

Switching __HIP_ENABLE_PCH to be a CMake option will enable correct
build behaviour.

Change-Id: I77a663589ffb5f2595c6ad3d144eb9466adcf250


[ROCm/hip commit: 3949675ab0]
2020-10-06 11:17:47 -04:00
Vladislav Sytchenko e4caaa2a77 Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""
This reverts commit 28b17d3dbd.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9


[ROCm/hip commit: ad2d55c144]
2020-10-05 13:20:58 -04:00
Vladislav Sytchenko 28b17d3dbd Revert "Merge branch 'amd-master-next' into amd-npi-next"
This reverts commit 258d79bca7.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I53322718dadde2c98f96140b8e260ec7ee9ef721


[ROCm/hip commit: 374ead1d19]
2020-10-05 13:02:39 -04:00
Cole Nelson 9157abcf47 CMakeLists.txt: Conformant package naming
Change-Id: I1c70559208606de8cc00909132cba38a2cc2ccd6
Signed-off-by: Cole Nelson <cole.nelson@amd.com>


[ROCm/hip commit: 318867a438]
2020-10-01 18:25:15 -04:00
agodavar 53fa367039 SWDEV-249870 - Short-Term solution for Pre-Compiled Headers for Online Compilation
Change-Id: Iec989787e546ff2eb68c4b146dc540655698b569


[ROCm/hip commit: 288fbe5af3]
2020-09-24 12:18:06 -04:00
Jatin 08ab76d58f CMake changes to now write to test folder
Change-Id: Ia898b31a09f3c59ef8e7d64253f28ae93c501277


[ROCm/hip commit: bf443fef82]
2020-09-21 00:37:15 -04:00
agodavar d9eef29787 SWDEV-249870 - Short-Term solution for Pre-Compiled Headers for Online Compilation
Change-Id: Ibcb365ce2ff27c4c2379609964078da42e1226b1


[ROCm/hip commit: 9e2fa6e215]
2020-09-09 13:44:13 -04:00
Jatin Chaudhary d93d0865f9 Removing redundant .hipInfo Install
Change-Id: Id8f7a4668d8b6965a47a464c94c19bc1036f3537


[ROCm/hip commit: c5264eaa67]
2020-07-28 02:01:53 -04:00
Ashutosh Mishra 1065f6333d Adding "BUILD_SHARED_LIBS" flag to cmake files
JIRA : SWDEV-234471
With this change compilation of the ibamdhip64 to be decied by arguments to build_hip_on_rocclr.sh file
build_hip_on_rocclr.sh -r (current) shall conitnue to create libamdhip64.so;
build_hip_on_rocclr.sh -r a (new) shall create libamdhip64.a
other options remain the same

Changed the targets according to requirement of stage2 dependencies.
Changed find_lib with find_package

Adpated the review comments

Change-Id: I719918f73ab33cd8031a32db6fe9b8adaa1b4b87


[ROCm/hip commit: ab88cbbb8a]
2020-07-16 00:29:14 -04:00
Jason Tang dd0c2582c5 SWDEV-242879 - Not to use fixnames
Change-Id: I3d0e2f3fe6c773e020c8bf8cdfd75fd565d61505


[ROCm/hip commit: e29b828b7c]
2020-07-02 08:15:07 -04:00
Matt Arsenault be81bc1593 Attempt to handle case where git isn't available
Git may not be available, and this may not be a git checkout, as would
happen in a release tarball. Doesn't really attempt to get a nicer
version formatting if some of the git subcommands fail.

Change-Id: Ib568cd1310983a43f2664ded72528d7e41f554c0


[ROCm/hip commit: 1983d720c2]
2020-05-28 09:23:24 -04:00
Matt Arsenault 7e55714dd5 Remove ROCclr search hacks
find_package should now be the only way to import ROCclr. Also update
the build example comment.

The build scripts used 2 custom variables to manually specify the
build and source directories for where to find VDI. Once renamed to
ROCclr, these conflicted with the variables automatically set by
find_package(ROCclr). These hacks tried to satisfy this intermediate
step to try satisfying commit ordering problems to get through PSDB.

The INSTALL.md documentation should also be updated, but it's
completely missing any mention of ROCclr now, and still gives
directions for hcc.

Change-Id: I6fc94b6cb36241a9d4f22d24e49523367f803461


[ROCm/hip commit: a2d2709ec1]
2020-05-22 15:52:35 -04:00
Aaron Enye Shi 161bfe2e37 Fix missing hip_prof_str.h in hip-base package
Change-Id: Icd163ff83fadc2ee0e68f5755c652a45d2e781e5


[ROCm/hip commit: 7c7c8a50e2]
2020-05-13 19:13:16 +00:00
Matt Arsenault 243e16b522 Don't write generated version.h to source directory
Change-Id: Ib4e7c3171cd227725ae35fed66167df528a4c431


[ROCm/hip commit: 73bc14ec49]
2020-05-08 10:59:28 -04:00
Matt Arsenault ba3a9377da Fix generated hip_prof_str.h install again
Change-Id: I92ea4bedbcdc92974998c00ca7f0c00098791cb5


[ROCm/hip commit: af4692f838]
2020-05-07 12:40:39 -04:00
Tao Sang afbd11eb66 Support performance tests
Support performance tests while direct tests commands keep unchanged.
To build performance tests, run "make build_perf".
To run all performance testis, run "make perf".
To run specific tests, for example, run
/usr/bin/ctest -C performance -R performance_tests/perfDispatch --verbose
To run individual test, for example, run
performance_tests/memory/hipPerfMemMallocCpyFree

Change-Id: I168c1b9ef1ec21b392d48648d0c71e8fbd37d57b


[ROCm/hip commit: 6e972dd3bb]
2020-05-06 14:06:07 -04:00
Payam 0c8b343931 name change vdi to rocclr
Change-Id: I06d198bbb4a499e153b290b73a92afed3553b252


[ROCm/hip commit: c5f76c3de3]
2020-05-06 09:14:30 -04:00
kjayapra-amd 5fd3b0b786 SWDEV-209747 - Add compiletime variable DEV_LOG_ENABLE
Change-Id: Ie8ff8abafa6b5e0f83209da42778688a047562c3


[ROCm/hip commit: 8f53157057]
2020-05-05 14:48:55 -04:00
Matt Arsenault b4308fadf2 Fix installing generated header to include/include
This isn't the ideal solution, but a lot more cleanups are needed for
how install is used.

Change-Id: I63a9c1a46d0da13ee4373038ece228005207271a


[ROCm/hip commit: 9b39b95417]
2020-05-01 12:43:49 -04:00
Matt Arsenault 5a873c1ab4 Don't emit generated hip_prof_str.h to source directory
The build should never touch the source directory, and only write
generated files to the output directory.

Also track the dependency with a custom command and target, as is the
normal method for dependencies on generated files.

Change-Id: I9d835256c643aeef241d26ca05ab390ebba65111


[ROCm/hip commit: b69e33038b]
2020-05-01 08:24:56 -04:00
Payam 72958eaee7 renaming vdi to rocclr, part 1
Change-Id: Idec9be2b6174217abcebaa1776e59168670740b1


[ROCm/hip commit: 4c3f8221e9]
2020-04-29 17:54:37 -04:00
Freddy Paul 027752bb3a hip-on-vdi: Enable RUNPATH and versioning
1. Enable versioning for HIP libraries
2. Enable RUNPATH on HIP libraries to find ROCm dependencies
3. Control HIP package install using CPACK_INSTALL_PREFIX

Change-Id: I9096da56592e9c78cdba329011f6e1bae99adaa2


[ROCm/hip commit: b75b602601]
2020-04-27 19:48:44 -04:00
root 2061d19165 Merge master into amd-master-next
Change-Id: I3fc1dc0c860d627053537581e75561e8a7efe327


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



[ROCm/hip commit: a0b5dfd625]
2020-04-23 09:12:06 -07:00
Sarbojit2019 90425eb47a [HIPTEST]common changes for unittest (#2017)
[ROCm/hip commit: e0364d23ff]
2020-04-17 10:31:47 +05:30
Yaxun (Sam) Liu e83752424d Fix MIOpen build failure
This is charrypick of b5a50ec9cf
and https://github.com/ROCm-Developer-Tools/HIP/pull/2009

Fix cmake config file

Removed cmake target files under packaging directory.

Merged cmake config .in files for HIP-Clang and HCC as one.

Use cmake generated target files in both install and packaging.

This makes cmake config file consistent for make install and
make package.

Let device side malloc/free return nullptr and trap

Change-Id: I448f3ea2d4934648089bad371debc203f895cba6


[ROCm/hip commit: 88304c15e6]
2020-04-13 23:01:31 -04:00
Yaxun (Sam) Liu b5a50ec9cf Fix cmake config file (#2010)
Removed cmake target files under packaging directory.

Merged cmake config .in files for HIP-Clang and HCC as one.

Use cmake generated target files in both install and packaging.

This makes cmake config file consistent for make install and
make package.

Change-Id: Iae1f8ccb5b39c29f54297edf1c5df62eb5a0253d

[ROCm/hip commit: 9ead991784]
2020-04-13 16:45:14 -07: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
Siu Chi Chan e58a0d06f7 don't expose symbols from code_object_bundle (#1971)
Change-Id: I56479485aad42c3d517fe6d9055be1cd846eeb00

[ROCm/hip commit: 43abf84f54]
2020-03-27 14:09:07 +05:30
Lad, Aditya 044a1924ba Merge branch 'master' into amd-master-next
Conflicts:
	CMakeLists.txt
	tests/src/texture/simpleTexture2DLayered.cpp
	tests/src/texture/simpleTexture3D.cpp

Change-Id: I4aa4754d391b5f37ddf15fa0bcfc84d9da020119


[ROCm/hip commit: d80edf9541]
2020-03-06 14:10:44 -05:00
Evgeny Mankov 82710c788a [HIP][cmake] Remove dependency from hipify-clang
[Reason] Upcoming hipify-clang's splitting out into a new repository https://github.com/ROCm-Developer-Tools/HIPIFY.


[ROCm/hip commit: 1561f61642]
2020-03-03 12:07:13 +03:00
Rahul Garg c34c9a4b4d Remove deprecated HIP markers (#1876)
[ROCm/hip commit: 6c5fa32815]
2020-02-28 16:47:15 +05:30
Jatin Chaudhary fa2cc448de Generating hiprtc lib with hcc+hip-clang
Review comments - generate hiprtc lib everytime when HIP_PLATFORM is hcc

Changes for hip-clang

Removing pre processor directive to simplify

Change-Id: Id38ab368362b58ee0458baeb8051fea709ae6bba


[ROCm/hip commit: 54447268cc]
2020-02-24 11:44:17 -05:00
Payam 6c10ab55ca updated package generation and removed hiphcc_static as a target for hip-vdi
Change-Id: I0067dd6341f47a212cb02b8d43d3ea01644c2391


[ROCm/hip commit: 28d8a38c0e]
2020-02-16 03:00:59 -05:00
ansurya fb53186682 Reduce GPU copying based on arch it runs on (#1751)
Implements SWDEV-213230.

[ROCm/hip commit: 8c6934223b]
2020-02-13 14:21:51 +05:30
Laurent Morichetti 8b18768a1c Merge branch 'master' into amd-master-next
Change-Id: Ib7e7824073f4dfc391fb3833fc90e11b327d3c22


[ROCm/hip commit: 258adce78e]
2020-02-05 14:56:08 -08: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