Граф коммитов

362 Коммитов

Автор SHA1 Сообщение Дата
Vladislav Sytchenko d42631046e SWDEV-301289 - Point to local AMD OpenCL via OCL_ICD_FILENAMES
The OCL_ICD_FILENAMES env var contains a list of OpenCL platforms that
the ICD should prepend to the list of reported platforms. Since the
built amdocl library will show up as the first platform, we can tell
ocltst to always run with platform 0. This way we guarantee that the
correct binary is being loaded.

Using this env var also makes programming LD_LIBRARY_PATH redundant
for Linux.

Change-Id: I8c1729e8b4dd1cd2df1a3da08c7b7addebd08b4f


[ROCm/clr commit: 6c9b07370c]
2021-09-25 17:03:17 -04:00
Vladislav Sytchenko 7757615404 SWDEV-301289 - Correctly reset optind when using getopt()
optind's starting value is 1 and it needs to be reset to 1 after each
getopt() invocation. Resetting it to 0 will cause getopt() to
reinitialize its internal state. This is only needed for some corner
cases. In our current usage, we should be resetting it to 1.

Change-Id: I68da7e41ee8b83b275e2a7bd660c13af569769f1


[ROCm/clr commit: 3d82092632]
2021-09-25 17:02:35 -04:00
Alex Xie 99cd3788c4 SWDEV-302875 - OpenCL build failure
clinfo should rely on OpenCL interface, headere file and library only

Change-Id: I8e09aa73b55f1a28c2e4403f52740803d0338c12


[ROCm/clr commit: 19ca123460]
2021-09-16 22:16:06 -04:00
Jason Tang cea605e632 SWDEV-1 - switch to C++17
Change-Id: I555914fc65f61259fe32a7f58864ac0dba1d641f


[ROCm/clr commit: 9ca733ca1e]
2021-09-04 17:19:02 -04:00
Maneesh Gupta 0e0c0da459 Merge "SWDEV-293197 - Add dependency on rocm-core" into amd-staging
[ROCm/clr commit: e9833dce24]
2021-09-02 01:10:40 -04:00
jujiang 40cc9aee95 SWDEV-286322 - clean up trailing white space
Change-Id: Ie47bc977e1598356b455957d96f9afa37794c1fd


[ROCm/clr commit: 422a26142d]
2021-09-01 14:53:14 -04:00
Icarus Sparry 45552d6168 SWDEV-293197 - Add dependency on rocm-core
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>
Change-Id: Id1b34c7c6fa551f3aacc35827cb6906cec4484e3


[ROCm/clr commit: d91e1d9daa]
2021-09-01 00:21:42 -07:00
Freddy Paul 799280db07 SWDEV-300274 - Path to OCL library not handled consistently
OpenCl applications are expected to work with publicly available
libopencl.so that is capable of finding vendor specific library
libamdocl64.so using the ICD loader entry.
x86_64-rocm-opencl.conf should provide ldconfig entry for
libamdocl64.so and libamdocl64.so shall use RUNPATH for finding
dependencies like hsa runtime.

Change-Id: Icf1267c7a04c1545eae0a7236bf8b7581ffa11ef


[ROCm/clr commit: 4790350f63]
2021-08-26 09:31:03 -07:00
Julia Jiang b6d8d42410 SWDEV-291894 - update branch info in OpenCL readme
Change-Id: I18e497f08ac3ef98e7b383eda62ec42ec7559912


[ROCm/clr commit: fdb61872c8]
2021-08-13 12:47:03 -04:00
Vladislav Sytchenko 6cbc64455e SWDEV-293871 - Update license for edited Khronos headers
We should acknowledge that we modified third party files.

Change-Id: I510e445d049faafe06bb78353431d9427f3eb20c


[ROCm/clr commit: 3cb3b5eb4b]
2021-07-12 12:19:45 -04:00
Ajay GunaShekar f5b87b646f Merge "SWDEV-293742 - Update copyrights end year for opencl repo" into amd-staging
[ROCm/clr commit: e37d6f831b]
2021-07-09 12:31:52 -04:00
Maneesh Gupta fb386f5b03 Merge "SWDEV-294276 - Fix clinfo install permissions" into amd-staging
[ROCm/clr commit: aaeed07bef]
2021-07-09 02:56:03 -04:00
agunashe 65362abf36 SWDEV-293742 - Update copyrights end year for opencl repo
Change-Id: I0ce8369a7ef569ac82c6e20266d0c98331a43e08


[ROCm/clr commit: 5a0ecc8e48]
2021-07-08 21:55:55 -07:00
Vladislav Sytchenko fb22edcc5e SWDEV-294276 - Fix clinfo install permissions
Specify for packaging that clinfo is a program. This will set its
default permissions to include OWNER_EXECUTE, GROUP_EXECUTE and
WORLD_EXECUTE.

Change-Id: I986f6db73efa9a3f8ab5bedfb829adccad0759aa


[ROCm/clr commit: 31e688d8f0]
2021-07-08 11:26:38 -04:00
Julia Jiang 318fd353de SWDEV-291787 - Update files with proper EOL
Change-Id: I3be96a3bb7d1d944f3a14b595df8ec533af6f953


[ROCm/clr commit: 82156484b4]
2021-07-07 18:03:52 -04:00
jujiang 748680e8a6 SWDEV-286322 - add .gitattribute
Change-Id: I0452a9c85bbb27adffebf4b1329d56a0f1d23ecd


[ROCm/clr commit: 2aa5689d7e]
2021-06-28 14:16:13 -04:00
Vladislav Sytchenko 43f722590c SWDEV-273235 - ocltst build fixes
Correctly reference the new amdocl target.

Do not use hardcoded paths to libamdocl64.so, instead query the path to
it from cmake.

Change-Id: I4738dd8d6d08f9fb72fdd725b6488b81342755a4


[ROCm/clr commit: 6046e6fea4]
2021-06-07 14:25:28 -04:00
Vladislav Sytchenko bb26e65554 SWDEV-289871 - Restore missing -Bsymbolic option
-Bsymbolic is required to make sure all AMD OpenCL runtime symbols are
resolved internally, otherwise ld might resolve them using symbols from
the OpenCL ICD. This will cause incorrect functions to be called.

Change-Id: I4ca0326a574ee2e537525bfda96ec20fabfe0158


[ROCm/clr commit: bc5c8df20b]
2021-06-07 14:22:53 -04:00
Vladislav Sytchenko ca460b03ee SWDEV-273235 - Enable building clinfo/cltrace on Windows
This patch also includes additional cleanup logic to the installation
rules. The OpenCL ICD already defines its own installation rules, no
need to duplicate them.

Change-Id: Id1c386307a83b82e21f6fa132e41957d9b348fd3


[ROCm/clr commit: c6eadce180]
2021-06-05 12:52:31 -04:00
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