Commit Graph

5141 Commits

Author SHA1 Message Date
Karthik Jayaprakash 18aa2145cd Merge "SWDEV-227602 - Adding support for hipFuncGetAttribute" into amd-master-next
[ROCm/clr commit: d7d49eb8e9]
2020-04-15 12:18:32 -04:00
Christophe Paquot ca7600b808 Merge "Fix build failure of rocPRIM" into amd-master-next
[ROCm/clr commit: b87d9405e6]
2020-04-14 15:02:09 -04:00
Vlad Sytchenko bde6f8b43a Correctly calculate size of the copy region
Since we adjust we adjust the start of the region, amd::BufferRect::end_ is no longer the size, just the offset as to where the region ends.

The actual size of the region is (amd::BufferRect::end_ - amd::BufferRect::start_).

Change-Id: I8425d8bdfb20f485740863813e762e8923d9ee94


[ROCm/clr commit: 4d6e394c73]
2020-04-14 12:25:17 -04:00
Yaxun (Sam) Liu 59b7920748 Fix build failure of rocPRIM
Two issues are fixed:

libamdhip64_static.a is not included in package.

cmake generated target files uses installation path of libraries
which are created when the libraries are built and installed.
The CI uses customized installation directory which is not
the package installation directory, thefore the library location
in cmake generated target files differs from the library location
installed from package. This causes rocPRIM build failure since
rocPRIM uses pkg-config which checks library location.

The fix is to fix the library location before adding cmake
generated target files to package.

Change-Id: I4aa2c6138f58df6d4a86301a5c0436edcb19ab70


[ROCm/clr commit: fa66140ee5]
2020-04-14 09:47:59 -04:00
Yaxun (Sam) Liu aadb232c20 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


[ROCm/clr commit: 4e1d05c4be]
2020-04-13 23:01:31 -04:00
kjayapra-amd e780909a6d SWDEV-227602 - Adding support for hipFuncGetAttribute
Change-Id: I16511274653c8c5521447eb2ed0fc5331dae8cba


[ROCm/clr commit: fc720c6287]
2020-04-13 21:23:04 -04:00
Vlad Sytchenko ba0c6101b0 Default stream needs to be initialized
Change-Id: I5cbf9076bffb51c0e99601393645f443c1658e13


[ROCm/clr commit: a9513154c7]
2020-04-13 15:32:35 -04:00
Vlad Sytchenko 60ec8d6047 Fix Windows build
Change-Id: I8c46c8ee82a6e47483d4c0430b483eead3772e5b


[ROCm/clr commit: ff3c449514]
2020-04-10 22:25:04 -04:00
Evgeny Shcherbakov 9b65761bdd Merge "fxing C compatibility (amd-master-next)" into amd-master-next
[ROCm/clr commit: 76363d90b8]
2020-04-10 13:41:47 -04:00
Maneesh Gupta 997cab12d3 Merge "Merge branch 'amd-master' into amd-master-next" into amd-master-next
[ROCm/clr commit: d02eb22c63]
2020-04-10 01:11:03 -04:00
Evgeny 8e6c6bc844 fxing C compatibility (amd-master-next)
Change-Id: Ib95b953bb49e0edbe044789b6ff81aaccb87f85f


[ROCm/clr commit: 8e2138b23b]
2020-04-10 00:08:09 -05:00
Vladislav Sytchenko 7779046de8 Correctly check max 1D image buffer size
VDI reports the limits in pixels, but user provides the size in bytes.

Make sure both values are in pixels before doing comparisons.

Change-Id: I082c7175c9fa4383e0b0ee38ff8c047c26ff20b4


[ROCm/clr commit: 28da0b89ea]
2020-04-09 21:37:43 -04:00
Vladislav Sytchenko 5ae3b3ac31 Fix Windows build
Change-Id: I8e219f8200875e3c46c1f54348317ba7ad8ae8ba


[ROCm/clr commit: 73751496e1]
2020-04-09 20:00:29 -04:00
Christophe Paquot 3b73ee5350 Merge "Remove a map lookup whenever we were getting the default stream" into amd-master-next
[ROCm/clr commit: 396e6a87ba]
2020-04-09 18:35:46 -04:00
Vladislav Sytchenko 3da0c744e1 Fix warnings when compiling with clang
The following warnings are addressed:

comparison of different enumeration types in switch statement

Change-Id: I6cb3948aeab7287851c57ecc1d4b3a439ab14ec6


[ROCm/clr commit: 524a81fcf5]
2020-04-09 17:07:48 -04:00
Christophe Paquot a7005281e8 Remove a map lookup whenever we were getting the default stream
Change-Id: I64b6d1deea41d81e94a58a83de287e78923656b3


[ROCm/clr commit: 137150f694]
2020-04-09 12:44:21 -07:00
Aakash Sudhanwa 50e6094f4f Merge "enabling hipPrintString (to master-next)" into amd-master-next
[ROCm/clr commit: 0f9266e3f1]
2020-04-09 15:08:35 -04:00
Vladislav Sytchenko de96ecc441 Disable all texture tests for VDI
Latest llvm already includes the texture/surface rework, but appropriate runtime changes have not been submitted.

Disable all texture related tests until http://gerrit-git.amd.com/c/compute/ec/hip/+/342147 is submitted.

Change-Id: I359c2eac6becdd3ca5110f2140679bd29d8ae54b


[ROCm/clr commit: b291104e7d]
2020-04-09 14:02:40 -04:00
Evgeny 68d860d006 enabling hipPrintString (to master-next)
Change-Id: I28859f3dbe5b867a858ca1d76c93e6fab6a68d1f


[ROCm/clr commit: cc60da5da1]
2020-04-09 09:57:27 -05: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
Sameer Sahasrabuddhe e2b46225c7 printf test: loop with divergent exit condition
Change-Id: I1071e4a240a280332bde669701c72228b9dea2df


[ROCm/clr commit: 7a51f9c5e8]
2020-04-09 10:20:11 +05:30
Michael LIAO 4fba98c2cf [hip] Fix volatile-qualified member function declartion.
- It should be a volatile-qualified member function instead of returning
  volatile type.

Change-Id: Id7aaa1953d56151b59e469ef22b9f4280f63bebb


[ROCm/clr commit: 35b001b33a]
2020-04-07 12:49:26 -04:00
Saleel Kudchadker 83e6fd2996 Merge "Revert "Wake up commandQueue before returning"" into amd-master-next
[ROCm/clr commit: f3e31ad00e]
2020-04-06 18:52:29 -04:00
Saleel Kudchadker fefdc97c2a Revert "Wake up commandQueue before returning"
This reverts commit 67c6b46cf0.

Reason for revert: German advised againt this change.

Change-Id: Ia1b1b9db60c965b2d9c006bd7d20012a9d7697e1


[ROCm/clr commit: 1b46f2622b]
2020-04-06 16:46:50 -05:00
Payam 3dbdfd27b7 updated LOG_LEVEL prints to print pid and tid
Change-Id: I8a9212b26bb7e312408a222823efcfd00344094b


[ROCm/clr commit: 14010cb705]
2020-04-06 16:58:25 -04:00
German Andryeyev abc3e6df5c SWDEV-184710
Support hipLaunchCooperativeKernelMultiDevice()

- Add validation logic for MGPU launches to pass a cuda test

Change-Id: Iccca7fde43493fc3bc6685512d39202271ae3e92


[ROCm/clr commit: 8be723e199]
2020-04-06 16:38:27 -04:00
German Andryeyev 093f0f6692 Merge "(SWDEV-228488)" into amd-master-next
[ROCm/clr commit: 9e93116097]
2020-04-06 16:30:37 -04:00
German Andryeyev 47409e7294 SWDEV-184710
Support hipLaunchCooperativeKernelMultiDevice()

- Add hipCooperativeLaunchMultiDeviceNoPreSync and
hipCooperativeLaunchMultiDeviceNoPostSync support to pass a cuda test

Change-Id: If518f11ef2636a2235e5df9e77f879d8ced68102


[ROCm/clr commit: 74e98ea447]
2020-04-06 15:29:03 -04:00
Vladislav Sytchenko 0dce36f508 (SWDEV-228488)
These fixes address regressions caused by http://gerrit-git.amd.com/c/compute/ec/hip/+/337601

Currently we're converting a 1D offset into a 3D offset, which doesn't make much sense once you consider the fact that this offset is relative to a different origin than our current 3D offset.

I traced through our blit kernels in VDI - the copy buffer rect path is able to handle immediate offsets in the 3D buffer via the amd::BufferRect::start_ parameter.

Instead of adjusting the offset, simply adjust the start of the region.

Change-Id: Ic8797a2c8ac0ad106f246f61ff06ca1ca03d3058


[ROCm/clr commit: a3613cc6da]
2020-04-06 14:17:11 -04:00
Michael LIAO 04d62f3fb6 [vdi] Fix -Wsign-compare warning. NFC.
- TeamCity build failed as `-Werror` is turned on.

Change-Id: Icd2cbd45f60e3c296894e8e73685e1d177f125a8


[ROCm/clr commit: 679f49c904]
2020-04-06 12:16:07 -04:00
German Andryeyev bcb3769d7f Merge "SWDEV-184709 - support hipLaunchCooperativeKernel()" into amd-master-next
[ROCm/clr commit: 056a2d7227]
2020-04-06 11:45:34 -04:00
Sameer Sahasrabuddhe 3535475677 SWDEV-227201: Introduce tests for printf on hostcall
Tests that check POSIX specifiers with a single thread:
 - hipPrintfSpecifiers.cpp     : all conversion specifiers
 - hipPrintfFlags.cpp          : common flags that modify conversions
 - hipPrintfAltForms.cpp       : alternate forms ('#')
 - hipPrintfStar.cpp           : additional arguments ('*')
 - hipPrintfWidthPrecision.cpp : floating point details

Tests that check functionality on top of hostcall
 - hipPrintfBasic.cpp       : divergent calls, series of calls, return value, etc
 - hipPrintfManyWaves.cpp   : many waves printing together
 - hipPrintfManyDevices.cpp : many waves on many devices

Change-Id: I35e069f4c542f896999239996dc89eda0faad7b8


[ROCm/clr commit: 01d4117789]
2020-04-06 00:49:34 -04:00
Christophe Paquot e55de39f91 Default HostMalloc to uncached memory
Change-Id: I72e19c7f7820a77fd5afc09f09cfea9acd0b8e84


[ROCm/clr commit: b820c66c55]
2020-04-03 19:19:33 -04:00
Saleel Kudchadker e4fdc74a80 Merge "Wake up commandQueue before returning" into amd-master-next
[ROCm/clr commit: 74dc32537e]
2020-04-03 18:27:03 -04:00
Michael LIAO d3dbeb54ee [vdi] Add hipFreeHost
Change-Id: I8a5b7ff3f0ab4f5674efd6723c18808ad6ef33f5


[ROCm/clr commit: 6fe3edc5a8]
2020-04-03 16:34:28 -04:00
German Andryeyev 0cafe090d2 Merge "SWDEV-184709 - support hipLaunchCooperativeKernel()" into amd-master-next
[ROCm/clr commit: 9e4aeb0f67]
2020-04-03 16:23:05 -04:00
Vladislav Sytchenko 4ca75d8ee2 Take into an account the number of channels...
when querying the element size of an array.

Change-Id: Id57d3374b14d80a59230ec8286704f2fbabb0fae


[ROCm/clr commit: c9084d0ad2]
2020-04-03 15:43:18 -04:00
German Andryeyev d14399f60f SWDEV-184709 - support hipLaunchCooperativeKernel()
- Add validation checks for cooperative launch to pass Cuda test

Change-Id: Ie296f0c3f113909d9a357879db3b2a833ab314c5


[ROCm/clr commit: 5efb3f26c0]
2020-04-03 15:18:21 -04:00
Michael Hong Bin Liao a54b720eba Merge "Fix size type in __hipRegisterVar" into amd-master-next
[ROCm/clr commit: 16ac35c4d5]
2020-04-03 15:12:21 -04:00
Saleel Kudchadker 67c6b46cf0 Wake up commandQueue before returning
Change-Id: I87eb5a22c81a9cb807474a960b5987d5fb6c2b86


[ROCm/clr commit: e2def55164]
2020-04-03 10:23:36 -07:00
Aaron En Ye Shi 074efe1568 Merge "Fix path for hip-clang when using hipcc (#1961)" into amd-master-next
[ROCm/clr commit: 0bb217245c]
2020-04-03 12:28:50 -04:00
Michael LIAO efe48959e9 Fix size type in __hipRegisterVar
Change-Id: I6b667600ae8f133583b768ab963318882b84179f


[ROCm/clr commit: d904f30f9e]
2020-04-03 10:51:58 -04:00
Michael Hong Bin Liao 1daf292d78 Merge "[hip] Clean up unnecessary casting." into amd-master-next
[ROCm/clr commit: 66aca97d6f]
2020-04-03 10:50:40 -04:00
German Andryeyev 8a6d893130 SWDEV-184709 - support hipLaunchCooperativeKernel()
- Enable cooperative tests for single and multiple devices

Change-Id: I54b6713f578b6b5e670f117b17469c0091028c99


[ROCm/clr commit: 2e948e4034]
2020-04-02 12:55:05 -04:00
Michael LIAO 978a25d960 [hip] Clean up unnecessary casting.
Change-Id: I64b08aaef5c67ffb49330c9c605611f1fbd3f5a2


[ROCm/clr commit: e3795436b2]
2020-04-02 12:46:15 -04:00
Paul Fultz II c196ac897b Fix path for hip-clang when using hipcc (#1961)
* Fix path for hip-clang when using hipcc

* Fix typo

* Update regex

Change-Id: I31bbee2e70d58b89191f970f5c6ae7e1c8b40900


[ROCm/clr commit: 58f04fb774]
2020-04-02 12:09:31 -04:00
Paul Fultz II eb2336fd32 Add missing flags for hip::device target on hip-clang (#1230)
This adds the missing compilation flags to hip::device so it can compile with hip-clang compiler.

Change-Id: Ie2b30ea606bfca385a0e84ae03ee0a8d828ad16a


[ROCm/clr commit: 631f82ab82]
2020-04-02 12:09:03 -04:00
Saleel Kudchadker 22a021d12e Merge "OpenCL2.2 Header changes" into amd-master-next
[ROCm/clr commit: 5a357a795a]
2020-04-02 02:46:49 -04:00
Vladislav Sytchenko ee88afced4 Add entry points for hipTexObject*() API
Even though the runtime and driver texture object API is one to one, the structs used by these APIs are not. See hipResourceDesc vs HIP_RESOURCE_DESC differences.

These differences are not trivial and most likely won't be able to handled by hipify, so we need new API entry points.

Change-Id: Id4bcb1ad0ae15378dbdb5a2ed07e5ea30f320082


[ROCm/clr commit: a09fadecf2]
2020-04-01 14:51:51 -04:00
Saleel Kudchadker 35e7b758e3 Merge "Cleanup stream from hip:Event class." into amd-master-next
[ROCm/clr commit: 99a024fc14]
2020-03-31 20:14:48 -04:00