Commit Graph

343 Commits

Author SHA1 Message Date
Vladislav Sytchenko 43b6294afb SWDEV-273235 - Do not use target_link_options()
Some CI systems have a somewhat out of date version of cmake, which
does not have this functionality. Fall back to using
target_link_libraries() instead.

Change-Id: I2410b24bcb6f1be2c2c3303ccd0019b10c914d2e


[ROCm/clr commit: 58c93c8047]
2021-06-02 21:03:28 -04:00
Vladislav Sytchenko 208c198d71 SWDEV-273235 - Correct linker export file usage
CMake doesn't handle linker export files in a general way well. On
Windows it is able to recognize a .def file and pass it to the linker.
Unfortunately it cannot do the same thing on Linux, so we have to
manually specify it.

Note that CMake can't recognize the current Windows export file due to
the .in suffix, hence why the amdocl.def file is being added. The
amdocl.def.in file will be removed later, as the Makefile build still
uses it.

Change-Id: I33a4151af0257d56d46cd27cbd028b34b77b706b


[ROCm/clr commit: 75b232eea2]
2021-06-02 12:56:14 -04:00
Vladislav Sytchenko 41a101bd58 SWDEV-273235 - Remove unused logic
git is invoked to populate OPENCL_VERSION_GITDATE, but the value is no
where to be used in the project.

Change-Id: Iceae650e6260c2ccd749f582034fc09205b4af7a


[ROCm/clr commit: 40f87d6d86]
2021-06-01 14:31:21 -04:00
Vladislav Sytchenko 9f54cba1ed SWDEV-273235 - Cleanup OpenCL installation logic
Don't use hardcoded install destinations. CMake will decide where things
should be installed based on platform.

Change-Id: Ifcf956181d3efb32d4ce6191a89c1ea225d0e8cc


[ROCm/clr commit: d53c19cfa5]
2021-06-01 14:31:14 -04:00
Vladislav Sytchenko 22cc67a4db SWDEV-273235 - Fix warning in the cmake build
Change-Id: I9840da22fcce11712c32e68f07ad886d08c8b16f


[ROCm/clr commit: ae36b6c0aa]
2021-05-27 18:09:26 -04:00
Vladislav Sytchenko f7bbb7b988 SWDEV-273235 - Initial support for Windows CMake
This change is tied to the ROCclr cmake rework. ROCclr will now be built
as part of OpenCL itself.

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

Change-Id: I5271302d073aef8cfa617828d218c856711bf9ba


[ROCm/clr commit: 1c16690617]
2021-05-27 13:08:12 -04:00
Payam Ghafari 6dc853cb26 Revert "SWDEV-197835 - adding Khronos OpenCL ICD build"
This reverts commit d09b6e30fc.

Reason for revert: need to update other projects (linuxpro & marnier)

Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580


[ROCm/clr commit: 0762c948b6]
2021-05-18 10:31:25 -04:00
Payam d09b6e30fc SWDEV-197835 - adding Khronos OpenCL ICD build
Change-Id: Id7d9cd6076c6f1670eedbea06a6976c05e391520


[ROCm/clr commit: 932c83fe8f]
2021-05-17 18:19:30 -04:00
Jason Tang 7fe2873a05 SWDEV-277566 - Use amd::Program::load interface
Change-Id: I0c19d4efcc09709b8aced6fa63e6deae39f58abb


[ROCm/clr commit: b423c699a6]
2021-05-10 16:46:03 -04:00
Vladislav Sytchenko 109a7255cb SWDEV-273235 - Allow explicitly disabling LF support
Currently LiquidFlash cannot be supported from Github Enterprise,
hence we need to be able to build with out it.

Allow this by setting -DWITH_LIQUID_FLASH=0.

Change-Id: I8f147b5d52ca1c8203000beea8f16b2699548dc3


[ROCm/clr commit: 8af3f12790]
2021-05-05 12:43:59 -04:00
Vladislav Sytchenko eeb06dd4b7 SWDEV-273235 - Remove implicit dependancy on WGL
Change-Id: I8355587be50492767caa3d2a4e602bdd6eb73960


[ROCm/clr commit: 4127be5c63]
2021-05-05 12:42:35 -04:00
Vladislav Sytchenko a1f74b3b7a SWDEV-273235 - Minor build fixes for Windows CMake
runtime directory only exists in P4. We should not be referencing it.

Change-Id: I1d88f32fccc716468c070235c4797bd905a76866


[ROCm/clr commit: 5958b3bba5]
2021-05-05 12:40:26 -04:00
German Andryeyev d108c2eee6 SWDEV-86035 - Disable liquidflash for PAL build under Linux
Change-Id: I19d335654f98277be0e9af8a25e38d86a6b8de2e


[ROCm/clr commit: c9feefc584]
2021-04-21 17:03:10 -04:00
pghafari b6461096d9 SWDEV-245532 - HIP - Vulkan interop, syntax update
Change-Id: I5fd4431bab4d975efec47298f2746fbcbbec8a44


[ROCm/clr commit: 74de707cf2]
2021-03-25 13:40:55 -04:00
Payam Ghafari 8bfbe25314 Merge "SWDEV-245532 - HIP - Vulkan interop" into amd-staging
[ROCm/clr commit: a4ec8608e8]
2021-03-23 23:36:59 -04:00
German Andryeyev 8382233851 Merge "SWDEV-276625 - Add implicit glFinish() for cl_khr_gl_event" into amd-staging
[ROCm/clr commit: f4cc6cf84f]
2021-03-23 14:32:21 -04:00
German Andryeyev 95091ae4a4 SWDEV-276625 - Add implicit glFinish() for cl_khr_gl_event
Modifies the behavior of clEnqueueAcquireGLObjects and
clEnqueueReleaseGLObjects to implicitly guarantee synchronization
with an OpenGL context bound in the same thread as
the OpenCL context.

Change-Id: I23eddee37a77f6c1c9d1a9ad3a3e1eb254a1ed82


[ROCm/clr commit: c4cde09339]
2021-03-22 16:49:03 -04:00
pghafari 5f179326bd SWDEV-245532 - HIP - Vulkan interop
Change-Id: Ied16503cc154fbda8ce28db25df746cccb19e0ba


[ROCm/clr commit: 67e9aac689]
2021-03-22 15:06:50 -04:00
Jason Tang a24ec756d0 SWDEV-277771 - Build opencl with c++ standard 14
Change-Id: I11c72b230320761f775e23816634b55ceaccb65e


[ROCm/clr commit: 2727d7047a]
2021-03-22 11:30:29 -04:00
German Andryeyev 6df593de96 SWDEV-276569 - Add P010 support for DX9
Change-Id: I652debccc0fabad89eff3052b884a59d44ee8233


[ROCm/clr commit: 89791c14f9]
2021-03-15 14:45:26 -04:00
German Andryeyev 7a411d1a41 Merge "SWDEV-276631 - return error codes for clCreateEventFromGLsyncKHR()" into amd-staging
[ROCm/clr commit: 89e15747ae]
2021-03-15 09:46:36 -04:00
German Andryeyev 890afbf666 SWDEV-276631 - return error codes for clCreateEventFromGLsyncKHR()
Change-Id: I9b93f5bde157d0f746a9d662ef35fbbb20cce6e6


[ROCm/clr commit: 9aebe61637]
2021-03-12 14:34:59 -05:00
Vladislav Sytchenko 4acce696ad SWDEV-240001 - Revert "Disable oclruntime OCLPerfCounters test"
This reverts commit 1f915dddd2.

Change-Id: Ib2ea933c456d76e4e7b20e759d43dd74064267ba


[ROCm/clr commit: 294318c8c6]
2021-03-09 10:55:56 -05:00
Vladislav Sytchenko ecb8c6508c SWDEV-240001 - OCLPerfCounters target ID changes
We don't care about target ID features in this test, so we can simply
strip them away to maintain compatability with the internal test table.

Change-Id: I44591a052c02f9e01876a8946f99cfedee371233


[ROCm/clr commit: b620121390]
2021-03-09 10:55:39 -05:00
Jason Tang b681f1c159 SWDEV-275828 - Fix api negative_get_platform_info test
Change-Id: Iffbcd4fe3b3b59a072e3374c0af3409338eeeca2


[ROCm/clr commit: 4ea3e44ac8]
2021-03-05 11:34:38 -05:00
German Andryeyev 092391b551 SWDEV-274464 - Enable pitch alignment for imagebuffer only
Change-Id: Icfe67e689f99f0859c997281abf80ae5254852fb


[ROCm/clr commit: cddfd9e301]
2021-03-02 15:28:51 -05:00
German Andryeyev ff6c8c32b3 SWDEV-274464 - Align image width for pitch calculation
Change-Id: I2f817993da06d2e6fe23e8b4b9d0fe10a2e61760


[ROCm/clr commit: b123dbed2a]
2021-02-27 01:30:52 -05:00
Jason Tang 342f25aa11 SWDEV-268345 - Remove ADDRESS_SANITIZER option from cmake
DevOps is going to add this through build scripts.

Change-Id: Id48ac9c1729d60f337e4cb7f0203822a05038e5e


[ROCm/clr commit: d21913f140]
2021-02-16 18:31:07 -05:00
German Andryeyev feed6a4b45 SWDEV-273071 - add mipmaps detection for FillImage
If mipmap was detected, then create a view with single mip level

Change-Id: I4519b35bd0365c108c42fdb37bfaad729dbc684e


[ROCm/clr commit: 4dc90dae10]
2021-02-16 16:19:28 -05:00
Julia Jiang 1e374d5abe SWDEV-271131 - update opencl readme
Change-Id: I6ffcde28f11f1d73a78b0a837a41992114415f31


[ROCm/clr commit: f5e6934216]
2021-02-02 13:22:37 -05:00
Vladislav Sytchenko 481b25fd08 SWDEV-1 - Fix Windows build
Change-Id: I3867b4a7175316121246a639fb8d704ad491adb6


[ROCm/clr commit: 70ac5c3bd8]
2021-01-26 11:01:30 -05:00
Todd tiantuo Li dcad5a921e Merge "SWDEV-267762 - add RMB(gfx1035) to deviceQuery" into amd-staging
[ROCm/clr commit: 280b759175]
2021-01-25 19:40:02 -05:00
Vladislav Sytchenko 35655388b0 SWDEV-264411 - Disable OCLDynamicBLines test
Change-Id: I067afa99b988e0b32edee7d27c1403d31775655c


[ROCm/clr commit: 290a16716d]
2021-01-22 16:55:18 -05:00
Jason Tang a97c8523f5 SWDEV-268345 - Enable address sanitizer build when ADDRESS_SANITIZER is ON
Change-Id: Iaef46358f33a399f8b047aaebc5154bb7352a69a


[ROCm/clr commit: 8d75c7e76f]
2021-01-21 18:31:14 -05:00
Tony Tye 2119330db1 SWDEV-268864 - Use new isa class to access isa related information
Change-Id: I866eeef06f86df77c651a25fdf7bceed2c28af52


[ROCm/clr commit: 91bb64409b]
2021-01-18 22:33:25 +00:00
Todd tiantuo Li 505f246c74 SWDEV-267762 - add RMB(gfx1035) to deviceQuery
Change-Id: I5388d9083a1b45751f024474ec4e0ae38e1e9107


[ROCm/clr commit: e1c4b22a32]
2021-01-12 09:13:40 -08:00
Vladislav Sytchenko 949a42427e Disable oclruntime.OCLDynamic test
This test is causing a PSDB timeout. Not all systems can support
device enqueue on rocm.

Change-Id: I55a209877288e6cc96b2426bf960fa9a431ac7c3


[ROCm/clr commit: ed812e304a]
2020-12-14 12:30:10 -05:00
Cole Nelson a0549a85db Merge "packaging: conformant package names" into amd-master-next
[ROCm/clr commit: c775ab32ef]
2020-11-20 12:50:42 -05:00
Cole Nelson 982fb1b666 packaging: conformant package names
This patchset addresses package name requirements:
http://confluence.amd.com/pages/viewpage.action?pageId=234791224

Email contact  corrected: SWDEV-258090

Names as tested (internal example):
rocm-opencl-dev_2.0.0.40000-cpnn.14322_amd64.deb

(release examples):
rocm-opencl-2.0.0.40000-sles152.3022.x86_64.rpm
rocm-opencl-devel-2.0.0.40000-3022.el8.x86_64.rpm

Change-Id: Icb202085ae4065ba264d02d34cadbf1a0f393f9a
Signed-off-by: Cole Nelson <cole.nelson@amd.com>


[ROCm/clr commit: 2174367fb4]
2020-11-20 07:17:35 -08:00
Jason Tang 4fc5f10159 SWDEV-256292 - Fix build failure when using lightning to build
clang complains there are multiple definitions of ret_val

Change-Id: I949af23e0658b28b339b378c9c0e4681d83d5f5a


[ROCm/clr commit: ee2e91912b]
2020-11-09 11:39:03 -05:00
Alex Xie 86eae09771 SWDEV-254386 [Navi 2x] Add Navi IDs to ocltst test
Cherry pick from npi branch.

Change-Id: I4e72c5477d7e0ebb454d651d1f84866ce4d27ee5


[ROCm/clr commit: ebd1a4a150]
2020-10-27 16:00:45 -04:00
Reshabh Sharma 202d12ae03 SWDEV-253557 Strip debug symbols for release builds
Change-Id: I4f75a0c08020ecd76e1eec159f266cd1f754af92


[ROCm/clr commit: 255c168ad7]
2020-10-16 16:10:51 +05:30
Reshabh kumar Sharma 6b51a4e16a Revert "SWDEV-253557 Strip debug symbols for release builds"
This reverts commit 78e8224ad3.

Reason for revert: Breaks mainline build

Change-Id: Ia1fc5e5723ec688d47544cc26127b680fad59b58


[ROCm/clr commit: 3997b03026]
2020-10-16 04:03:07 -04:00
Reshabh Sharma 78e8224ad3 SWDEV-253557 Strip debug symbols for release builds
Change-Id: I50032cb6aae7b1ed1a95c8e84fa8ce5cce476570


[ROCm/clr commit: 4c15a8f190]
2020-10-15 23:41:27 -04:00
Jason Tang 0e19d02735 SWDEV-255321 - Support target names from Target ID feature
Change-Id: I45e5314dff2ee65dd402c38744279bf67501304d


[ROCm/clr commit: bad12583b0]
2020-10-06 09:00:54 -04:00
Vladislav Sytchenko 1f40ca06a6 Don't use CMAKE_SOURCE_DIR
Change-Id: I373e218850e72ca8fe7f76a7af3e559c485c569b


[ROCm/clr commit: bd4c6ce6dc]
2020-09-23 13:04:05 -04:00
Vladislav Sytchenko 9d006dee2d Correctly append CMAKE_SHARED_LINKER_FLAGS
Change-Id: Id207f7b7eea7420657162ed666fb4240e3b6e9a1


[ROCm/clr commit: c70ff63d87]
2020-09-23 13:04:02 -04:00
Jason Tang 342a8161a7 SWDEV-251394 - Support CL_DEVICE_IL_VERSION
Change-Id: If8459d6822d26107914f81d219e94165facd0827


[ROCm/clr commit: ac956ac8cb]
2020-09-10 18:09:15 -04:00
Jason Tang 0d1525545c Add support for CL_PROFILING_COMMAND_COMPLETE
Change-Id: I2acabab8975f7c8619c180795000cb47d4f532ca


[ROCm/clr commit: 7ec780519a]
2020-09-07 11:15:31 -04:00
Jason Tang 4500240354 Remove refering to gfxipVersion_
Change-Id: I06e3fe5c10ddf50674c69d7de68f208bbfb83f2f


[ROCm/clr commit: 6c13a34a04]
2020-08-24 14:38:16 -04:00