Commit Graph

296 Commits

Author SHA1 Message Date
Jason Tang ac956ac8cb SWDEV-251394 - Support CL_DEVICE_IL_VERSION
Change-Id: If8459d6822d26107914f81d219e94165facd0827
2020-09-10 18:09:15 -04:00
Jason Tang 7ec780519a Add support for CL_PROFILING_COMMAND_COMPLETE
Change-Id: I2acabab8975f7c8619c180795000cb47d4f532ca
2020-09-07 11:15:31 -04:00
Jason Tang 6c13a34a04 Remove refering to gfxipVersion_
Change-Id: I06e3fe5c10ddf50674c69d7de68f208bbfb83f2f
2020-08-24 14:38:16 -04:00
Julia jiang ed1fcc7c63 SWDEV-247185-update OpenCL build instructions in Readme
Change-Id: Id2835bfcbc3d19315c688a8160eedf367056ba5f
2020-08-06 12:10:36 -04:00
Freddy Paul 00223c5697 Enable STATIC LINKING of COMGR
COMGR_DYN_DLL is used by rocclr to load COMGR as dynamic library.
Need to remove this flag while linking COMGR as static lib by
ROCclr.

Default option is set to link COMGR as dynamic library

Change-Id: I5631a8c1d896bd4d7e5ecf5ef5fa4f631cd2244d
2020-07-22 16:07:05 -07:00
Tao Sang 56443c2c3d Let rocclr decide numa dependence
Change-Id: Idaf8ab1d0563ac39c352219a6dacf95745bdc6b0
2020-07-19 23:29:59 -04:00
Pruthvi Madugundu b88a313eff Adding support for multiple icd files specific to ROCm version
- amdocl64.icd is renamed to amdocl64_<ROCM_PATCH_VERSION>.icd
- This will enable support for multiple icd for different versions of
  ROCm

Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: I8031b19f8579507ffb6727dedcd2e3fbb4e45de8
2020-07-09 18:04:18 -07:00
Vlad Sytchenko 3be244fb34 Add ability to run each ocltst test individually
Now one can run a single test by invoking `make test.ocltst.${module_name}.${test_name}`. Invoking `make test.ocltst.${module_name}` will still run all of the modules tests.

Change-Id: I31b384576cb09800e580e41c12528a276899b6c2
Signed-off-by: Vlad Sytchenko <Vladislav.Sytchenko@amd.com>
2020-07-06 15:56:46 -04:00
Matt Arsenault 03ed004255 Use option for BUILD_SHARED_LIBS
This avoids blindly overwriting the setting.

Change-Id: I38dff67f406c4547806a96f4ab220a7415d96242
2020-06-30 15:01:46 -04:00
Jason Tang 0394f79d4d Fix CentOS build
Change-Id: Id0956f2a876077a3528c4fafc136586b95fdda70
2020-06-29 18:49:48 -04:00
Jason Tang 4666113db0 Not to use fixnames
Change-Id: I50c9503cad1fc072edec989a4f82a27bb7bb3909
2020-06-28 18:57:16 -04:00
Tao Sang 9171896d73 Fix missing numa symbol in building libamdocl64.so
Change-Id: I77eca06345b11b5c8482ab626ef1b60c5fa20ec8
2020-06-23 11:29:28 -04:00
Vlad Sytchenko ac3848a8e6 Enable the use of some warnings when building OCL-ROCclr
Similar to http://gerrit-git.amd.com/c/compute/ec/vdi/+/375385, except no -Wno-strict-aliasing.

With this change only one warning shows up during the build - -Wdeprecated-declarations in cltrace.

Change-Id: Ie335eb9c45287ee1006e6bd65d54d67b41f79604
2020-06-15 15:28:33 -04:00
Jason Tang 17dafe33de Enable OCLReadWriteImage test on Linux
Change-Id: I613e5ff6dd0234515409b8d3f7277f5bbdd1bd20
2020-06-10 15:30:23 -04:00
Matt Arsenault dd5f255c7e Don't add -std flag to CMAKE_CXX_FLAGS
Use the cmake method, and consolidate setting the language standard in
one place.

Change-Id: I96826c31955b1553ed1beb94203c99933075bb0a
2020-06-05 11:22:23 -04:00
Vlad Sytchenko ce2c28c745 Disable oclruntime OCLPerfCounters test
For some reason the test is causing latest rocr to crash. Disabling for now to investigate.

Change-Id: I78996241e6756c36af4b7f5fcb34e915bf33573e
2020-06-03 13:57:40 -04:00
Vlad Sytchenko 8790099ba9 Add cmake targets to run ocltst test modules
Tests are now excluded from the main build, however ocltst can still be built by running `cmake --build . --target ocltst`.

Test modules can be run by invoking the test_${module_name} target, for example `cmake --build . --target test_oclruntime`.

Change-Id: I6f40d3bd318e821e4fbf35ccfa395dc7036673cb
2020-06-03 13:55:28 -04:00
Vlad Sytchenko 876cf62e0e Only build oclgl tests if OpenGL is installed on the system
Change-Id: I226f2e09c98a970ce8dce0b6f670ca13d868aeb6
2020-06-02 13:31:29 -04:00
Jason Tang 1171ec72be Use ROCMSetupVersion only when ROCM is found
Change-Id: I2d76762aaa6c89b2ba956dcb62b3f79f6208a365
2020-06-02 10:40:25 -04:00
Jason Tang 4dcfe78e56 SWDEV-204566 - Use ROCMSetupVersion to set package version
Change-Id: I29b9f748291b3802de65c9f29f791050853c2d12
2020-06-01 16:39:35 -04:00
Vlad Sytchenko 15b318b444 Add ocltst build files
Change-Id: I8fcff320efb677a5efa5ee48efe1a6bbb259539f
2020-06-01 14:12:51 -04:00
Vlad Sytchenko 75e6add24d Initial source drop of ocltst
This only adds source files for ocltst and the following test modules - oclruntime, oclperf, oclgl, ocldx. There's no build files for now.

Change-Id: I0f8d9d074c45d82e92f7d30bf22753102f272f4f
2020-06-01 13:51:51 -04:00
Alex Xie f887aaa9d2 Add more information into Readme file
Change-Id: Id3e484877eaf8123ad6c767caa5f3546c02f5d98
2020-05-29 13:33:29 -04:00
Matt Arsenault d191ba6585 Remove build hacks to support old manually set ROCclr variables
Change-Id: Iba8180b7260616a79723a1a9d2b0b206f178e735
2020-05-27 12:53:27 -04:00
Alex Xie a400051d3a Move rocm include directory to the end of the list for include files
Fix compile error.

Before this change, there is compile error in my build computer. The cause is that /opt/rocm/include has an older version of CL header files.
When compiling, we should use header files from this opencl source code folders first.

This fix changes the order of include directories. Search the header files inside this opencl source code folders first.

Change-Id: I3420a634ed9e1b38b8e5201a0a39a36d61f97986
2020-05-22 11:57:34 -04:00
Matt Arsenault aa0c163066 Use option for USE_COMGR_LIBRARY
Use standard cmake option handling, and switch to standard ON/OFF for
boolean. Try to maintain compatability with the "yes" check that build
scripts are now using.

Change-Id: Ia932e93f818c0897a87bfc49b070e36c7be7dd74
2020-05-22 10:28:55 -04:00
Matt Arsenault 7273fdedfe Fix include directories for cltrace
Change-Id: I8de82fa4b6ce7e1e869f1001d1710dc8673b7be5
2020-05-19 21:41:16 -04:00
Jason Tang 601cf7d4bb Add dlerror to ICD to help future diagnosis
Change-Id: Ieb95252ab671ff666fceee3349637683078a0f89
2020-05-19 10:49:19 -04:00
Matt Arsenault 9f9d35ad86 Restore attempt to use find_package for ROCclr
94b20323 broke this. This is still mostly a commit order hack until
the ROCclr change is submitted.

Change-Id: I43762963dbc66f1dc83916d2f0e9c90e4fcbf7c1
2020-05-18 14:34:35 -04:00
Ramesh Errabolu 42150302e6 Remove dependency on hsa-ext-rocr-dev package
Change-Id: I1b4032390c128e71a2f9a743b9db9b7bf7713e91
2020-05-15 16:56:30 -05:00
Freddy Paul e43d427cdd opencl-on-vdi:Add symlink for libopencl lib to ROCm lib
Move libOpenCL.so from rocm-opencl-dev package to rocm-opencl.
Having the libOpenCL.so alone and that too just a symlink pointing
to a file in another package is not the right way.

Adding a symlink for libOpenCL... to rocm/lib will make package
deployment easier.

Change-Id: Icc98d2280253c8a485ef906e97fc75129ad6d064
2020-05-11 14:02:37 -07:00
Julia Jiang 984d6545e6 Merge "SWDEV-230009-Cltrace log is not created as expected-Update return type to vdi_agent" into amd-master-next 2020-05-11 13:50:59 -04:00
jujiang 1662b25dc6 SWDEV-230009-Cltrace log is not created as expected-Update return type to vdi_agent
Change-Id: Ice4083d0d3a061867f886119a4cc541e2048a328
2020-05-08 18:56:25 -04:00
Jason Tang 372ebe7b00 Add dependency of hsa-rocr-dev and hsa-ext-rocr-dev
in-line with hip-on-vdi.

Change-Id: Ib0e1a5180eef409cfd0f1b5b9a42a2b663dfc0d3
2020-05-08 13:23:37 -04:00
jujiang 08b66a4b1b SWDEV-230009-Cltrace log is not created as expected-Create dynamic library
Change-Id: I813d14c093d222c82bec6824b52cc7839f89cef5
2020-05-06 14:32:00 -04:00
Payam 94b203235e name change vdi to rocclr
Change-Id: I59650f7082dd118c1fe92309b76a5bdb20eee3c1
2020-04-30 19:06:58 -04:00
Matt Arsenault 585741a040 Use find_package to find rocclr
Maintain compatability with current hardcoded scheme for now for
commit order convenience.

Change-Id: I0b8299fceab1cc405ae5f26a129f2f1ea3d56773
2020-04-28 16:41:53 -04:00
Payam Ghafari 10de80eb17 Merge "adding cltrace" into amd-master-next 2020-04-28 09:48:35 -04:00
Payam 50563e4544 adding cltrace
Change-Id: I19b06f9a5954f317bbd00b5c2447ed5b6e9f30ae
2020-04-28 05:49:30 -04:00
Matt Arsenault 5943e4d93e Don't use intermediate object library
This added an unnecessary level of indirection, and also didn't
automatically pull in interface dependencies from the linked targets.

Change-Id: I7371ab3c184f6045947a96c8a393f2e3452fc5c1
2020-04-24 15:31:35 -04:00
Matt Arsenault fc4afbd0f9 Use cmake features to set C++ version
Change-Id: Icf5dcd781b8fecc7a39117f3c6dee97dcba9dcca
2020-04-21 15:22:50 -04:00
Pruthvi Madugundu 8ba1527661 Make CMAKE_SHARED_LINKER_FLAGS appendable
Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: I3c23223270976b8746d5b4debf4d846ae0aa4c6f
2020-04-20 13:51:05 -04:00
Pruthvi Madugundu bbcfe78d1c Merge "Removing ld.so.conf entry for Opencl package" into amd-master-next 2020-04-20 13:50:41 -04:00
Pruthvi Madugundu 5f710a5ecb Removing ld.so.conf entry for Opencl package
- The entry removed only when the installation is NOT /opt/rocm

Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: Ib90f89e63cffb4ae8f628af15387a49bb6511a5f
2020-04-17 12:27:57 -07:00
Payam 6e5b4ff46c adding License file
Change-Id: I495066010288a346b0cfaee44554a5aa8dace491
2020-04-17 14:28:24 -04:00
Vlad Sytchenko 0779b034c4 Cherry pick 5c6b85 from KhronosGroup/OpenCL-CLHPP
Updates cl2.hpp and cl.hpp to handle case of platform with zero devices without error.

Change-Id: I6190c65ebf894b3a26579c54e96881c334346358
2020-04-14 16:11:15 -04:00
Payam 17d5d73ff2 Adding an initial Readme file
Change-Id: I4eccb10383c555c88adf30fb695b41be3f869dc5
2020-04-10 15:45:27 -04:00
Vladislav Sytchenko c4a02ce16f Fix Windows build
The D3D interop APIs are now declared in the CL headers, so we need to remove our declarations.

The CL headers also automatically include the D3D headers, which need to be included in a specific order (11 -> 10 -> 9), hence why the includes needed to be reshuffled.

Change-Id: I9bd37ceabec82e8bebd1d9c1a5a672ffc95c41d8
2020-04-07 18:44:01 -04:00
Payam 3092e7c906 removed unused cl.hpp in clinfo
Change-Id: Idb7fc843d380322502a249231ef60799ae291ca1
2020-04-06 19:05:24 -04:00
Saleel Kudchadker 49f3835666 Promote Khronos OpenCL-ICD-Loader master
master as of https://github.com/KhronosGroup/OpenCL-ICD-Loader/
commit/c7fda8bb042760b5ead8650c64445f5972a64ad7

Change-Id: Ia852f55ecf0b0aceff915991328812ed9788698f
2020-04-02 17:02:58 -04:00