Graf commitů

229 Commity

Autor SHA1 Zpráva Datum
Tao Sang 8a2b0b7424 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
2021-01-05 10:39:31 -05:00
Tao Sang a7aa84f73a Some improvements on hip cmake file
1.Fix unexpected repeated hip runtime lib building
2.Seperate test cmake from top cmake.

Change-Id: I1ae457effd639d6c25bca293c1724b026be21ecd
2020-12-11 13:32:15 -05:00
Tao Sang 1cba7ec965 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
2020-12-09 15:49:47 -05:00
agodavar 9ef681a618 SWDEV-249870: Generate Pre-Compiled Headers from includes in source repo for Online Compilation
Change-Id: I663f510603e983927f80f7944df4d039ba7bc0b0
2020-11-12 10:50:33 -05:00
agodavar c7aa311537 Fix building of tests on nvidia GPU
Change-Id: I02b527ec4135c79bb35cbbfe419211ec363cb065
2020-11-02 09:42:28 -05:00
agodavar 8717a78bf7 cmake hip-rocclr as default build,change HIP_PLATFORM to amd|nvidia
Change-Id: I59d2e15b297b6ca2d5eee1a6dee642bdb01a3839
2020-10-21 07:26:14 -04:00
Vladislav Sytchenko 8034467ec3 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
2020-10-06 11:17:47 -04:00
Vladislav Sytchenko d5aa0f607d Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""
This reverts commit 9142674ef0.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9
2020-10-05 13:20:58 -04:00
Vladislav Sytchenko 9142674ef0 Revert "Merge branch 'amd-master-next' into amd-npi-next"
This reverts commit d7c02619d6.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I53322718dadde2c98f96140b8e260ec7ee9ef721
2020-10-05 13:02:39 -04:00
Cole Nelson a900c86746 CMakeLists.txt: Conformant package naming
Change-Id: I1c70559208606de8cc00909132cba38a2cc2ccd6
Signed-off-by: Cole Nelson <cole.nelson@amd.com>
2020-10-01 18:25:15 -04:00
agodavar 3c9bbc335a SWDEV-249870 - Short-Term solution for Pre-Compiled Headers for Online Compilation
Change-Id: Iec989787e546ff2eb68c4b146dc540655698b569
2020-09-24 12:18:06 -04:00
Jatin 2cce9170c3 CMake changes to now write to test folder
Change-Id: Ia898b31a09f3c59ef8e7d64253f28ae93c501277
2020-09-21 00:37:15 -04:00
agodavar 38ce8784c0 SWDEV-249870 - Short-Term solution for Pre-Compiled Headers for Online Compilation
Change-Id: Ibcb365ce2ff27c4c2379609964078da42e1226b1
2020-09-09 13:44:13 -04:00
Jatin Chaudhary 78fcbab8c2 Removing redundant .hipInfo Install
Change-Id: Id8f7a4668d8b6965a47a464c94c19bc1036f3537
2020-07-28 02:01:53 -04:00
Ashutosh Mishra a77c7e21be 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
2020-07-16 00:29:14 -04:00
Jason Tang c371b4e3b0 SWDEV-242879 - Not to use fixnames
Change-Id: I3d0e2f3fe6c773e020c8bf8cdfd75fd565d61505
2020-07-02 08:15:07 -04:00
Matt Arsenault eb31e45123 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
2020-05-28 09:23:24 -04:00
Matt Arsenault a98920d9a3 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
2020-05-22 15:52:35 -04:00
Aaron Enye Shi e61b8dc425 Fix missing hip_prof_str.h in hip-base package
Change-Id: Icd163ff83fadc2ee0e68f5755c652a45d2e781e5
2020-05-13 19:13:16 +00:00
Matt Arsenault 72675bf079 Don't write generated version.h to source directory
Change-Id: Ib4e7c3171cd227725ae35fed66167df528a4c431
2020-05-08 10:59:28 -04:00
Matt Arsenault 5e28b28044 Fix generated hip_prof_str.h install again
Change-Id: I92ea4bedbcdc92974998c00ca7f0c00098791cb5
2020-05-07 12:40:39 -04:00
Tao Sang f99c3ac337 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
2020-05-06 14:06:07 -04:00
Payam dba0e72de2 name change vdi to rocclr
Change-Id: I06d198bbb4a499e153b290b73a92afed3553b252
2020-05-06 09:14:30 -04:00
kjayapra-amd 1687e8c90c SWDEV-209747 - Add compiletime variable DEV_LOG_ENABLE
Change-Id: Ie8ff8abafa6b5e0f83209da42778688a047562c3
2020-05-05 14:48:55 -04:00
Matt Arsenault 80bc98afee 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
2020-05-01 12:43:49 -04:00
Matt Arsenault b618939e2e 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
2020-05-01 08:24:56 -04:00
Payam cb7d3227e8 renaming vdi to rocclr, part 1
Change-Id: Idec9be2b6174217abcebaa1776e59168670740b1
2020-04-29 17:54:37 -04:00
Freddy Paul 2a271dc418 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
2020-04-27 19:48:44 -04:00
root b5031f39b1 Merge master into amd-master-next
Change-Id: I3fc1dc0c860d627053537581e75561e8a7efe327
2020-04-26 22:19:37 +00:00
Maneesh Gupta f2e1118d7a Merge in the rocclr based hip runtime (#2032)
* Merge master-next changes in master (include vdi development in master branch)
2020-04-23 09:12:06 -07:00
Sarbojit2019 7808be893f [HIPTEST]common changes for unittest (#2017) 2020-04-17 10:31:47 +05:30
Yaxun (Sam) Liu 4e1d05c4be Fix MIOpen build failure
This is charrypick of 9ead991784
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
2020-04-13 23:01:31 -04:00
Yaxun (Sam) Liu b1ed909f73 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
2020-04-13 16:45:14 -07:00
Maneesh Gupta 0ea6697192 Merge branch 'amd-master' into amd-master-next
Change-Id: I3094c15008093f2072bcd38aca4ea90aeae2d97b
2020-04-09 06:31:00 -04:00
Siu Chi Chan 6ab1e864b6 don't expose symbols from code_object_bundle (#1971)
Change-Id: I56479485aad42c3d517fe6d9055be1cd846eeb00
2020-03-27 14:09:07 +05:30
Lad, Aditya e7fdb3d796 Merge branch 'master' into amd-master-next
Conflicts:
	CMakeLists.txt
	tests/src/texture/simpleTexture2DLayered.cpp
	tests/src/texture/simpleTexture3D.cpp

Change-Id: I4aa4754d391b5f37ddf15fa0bcfc84d9da020119
2020-03-06 14:10:44 -05:00
Evgeny Mankov ff7165a73c [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.
2020-03-03 12:07:13 +03:00
Rahul Garg 6be7537cf9 Remove deprecated HIP markers (#1876) 2020-02-28 16:47:15 +05:30
Jatin Chaudhary 8bf287ef18 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
2020-02-24 11:44:17 -05:00
Payam 2f9cb366f2 updated package generation and removed hiphcc_static as a target for hip-vdi
Change-Id: I0067dd6341f47a212cb02b8d43d3ea01644c2391
2020-02-16 03:00:59 -05:00
ansurya 888a7f2a90 Reduce GPU copying based on arch it runs on (#1751)
Implements SWDEV-213230.
2020-02-13 14:21:51 +05:30
Laurent Morichetti c33903b5da Merge branch 'master' into amd-master-next
Change-Id: Ib7e7824073f4dfc391fb3833fc90e11b327d3c22
2020-02-05 14:56:08 -08:00
Laurent Morichetti 2f1305b9a4 Merge branch 'origin/pghafari/hip-vdi' into lmoriche/amd-master-next
Change-Id: I22c145d39f430ca571a981687bcb034ea6e3b8a2
2020-01-31 07:33:12 -08:00
Alexey Chernov 9f5a4148ce Clear HIP_PATH before version detection (#1786)
Don't allow `HIP_PATH` to be propagated to `hipconfig`,
when run by CMake to detect the package version, as it
leads to the wrong version is detected: when there's
already HIP of some different version installed in the
system and `HIP_PATH` points to its location, `hipconfig`
tends to return the version of the installed HIP, rather
than the value defined for the distribution. The compiled
results report wrong version and spoils the rest of the
stack in this case.
2020-01-24 16:21:49 +05:30
paulfreddy c5ed5c71a3 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
2020-01-21 14:17:35 +05:30
Jatin Chaudhary 0b211478dd Remove filesystem dependency in hipRTC (#1749)
Removing dependency on filesystem, so libstdc++fs is no longer required to link
2020-01-10 13:47:54 +05:30
Rahul Garg 3fe1695c3a Fix hipcc warning related to hipVersion (#1767)
* Fix hipcc warning related to hipVersion
* Rename hipVersion.h to hip_version.h
* Remove HIP_VERSION splitting
* Update .gitignore
- Ignore generated include/hip/hip_version.h
- Removed some stale entries
- Added executables from samples/1_Utils/*/ for consistency with bin/ entries.
2020-01-06 12:33:23 +05:30
Sarbojit2019 4fd77f8336 Change to generate hipVersion.h (#1726)
HIP_VERSION_MAJOR, HIP_VERSION_MINOR, HIP_VERSION_PATCH and HIP_VERSION pre-processor macros are now defined in hipVersion.h instead of being set by hipcc.
2019-12-30 12:44:24 +05:30
Maneesh Gupta 59b3bd0048 [packaging] Rename hip packages to conform to debian package renaming rules (#1708) 2019-12-04 15:55:37 +05:30
Maneesh Gupta 38e971b645 Revert "[packaging] Conform to debian package naming rules (#1647)" (#1688)
This reverts commit 5a03482690.
2019-12-01 14:47:43 +05:30