Commit Graph

295 Commits

Author SHA1 Message Date
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
Julia jiang b2f831ca46 SWDEV-247185-update OpenCL build instructions in Readme
Change-Id: Id2835bfcbc3d19315c688a8160eedf367056ba5f


[ROCm/clr commit: ed1fcc7c63]
2020-08-06 12:10:36 -04:00
Freddy Paul af1916a2f9 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


[ROCm/clr commit: 00223c5697]
2020-07-22 16:07:05 -07:00
Tao Sang 03c1acd0f8 Let rocclr decide numa dependence
Change-Id: Idaf8ab1d0563ac39c352219a6dacf95745bdc6b0


[ROCm/clr commit: 56443c2c3d]
2020-07-19 23:29:59 -04:00
Pruthvi Madugundu 67591d6671 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


[ROCm/clr commit: b88a313eff]
2020-07-09 18:04:18 -07:00
Vlad Sytchenko 0611a0502a 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>


[ROCm/clr commit: 3be244fb34]
2020-07-06 15:56:46 -04:00
Matt Arsenault 4c38d6f0a7 Use option for BUILD_SHARED_LIBS
This avoids blindly overwriting the setting.

Change-Id: I38dff67f406c4547806a96f4ab220a7415d96242


[ROCm/clr commit: 03ed004255]
2020-06-30 15:01:46 -04:00
Jason Tang c0a9560c1b Fix CentOS build
Change-Id: Id0956f2a876077a3528c4fafc136586b95fdda70


[ROCm/clr commit: 0394f79d4d]
2020-06-29 18:49:48 -04:00
Jason Tang 3c0b0d9d92 Not to use fixnames
Change-Id: I50c9503cad1fc072edec989a4f82a27bb7bb3909


[ROCm/clr commit: 4666113db0]
2020-06-28 18:57:16 -04:00
Tao Sang f184916c46 Fix missing numa symbol in building libamdocl64.so
Change-Id: I77eca06345b11b5c8482ab626ef1b60c5fa20ec8


[ROCm/clr commit: 9171896d73]
2020-06-23 11:29:28 -04:00
Vlad Sytchenko 434a1719a3 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


[ROCm/clr commit: ac3848a8e6]
2020-06-15 15:28:33 -04:00
Jason Tang 83153d4a2d Enable OCLReadWriteImage test on Linux
Change-Id: I613e5ff6dd0234515409b8d3f7277f5bbdd1bd20


[ROCm/clr commit: 17dafe33de]
2020-06-10 15:30:23 -04:00
Matt Arsenault e5ce842e8a 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


[ROCm/clr commit: dd5f255c7e]
2020-06-05 11:22:23 -04:00
Vlad Sytchenko 1f915dddd2 Disable oclruntime OCLPerfCounters test
For some reason the test is causing latest rocr to crash. Disabling for now to investigate.

Change-Id: I78996241e6756c36af4b7f5fcb34e915bf33573e


[ROCm/clr commit: ce2c28c745]
2020-06-03 13:57:40 -04:00
Vlad Sytchenko 30621ae614 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


[ROCm/clr commit: 8790099ba9]
2020-06-03 13:55:28 -04:00
Vlad Sytchenko fbc4d1b788 Only build oclgl tests if OpenGL is installed on the system
Change-Id: I226f2e09c98a970ce8dce0b6f670ca13d868aeb6


[ROCm/clr commit: 876cf62e0e]
2020-06-02 13:31:29 -04:00
Jason Tang 428cf966e7 Use ROCMSetupVersion only when ROCM is found
Change-Id: I2d76762aaa6c89b2ba956dcb62b3f79f6208a365


[ROCm/clr commit: 1171ec72be]
2020-06-02 10:40:25 -04:00
Jason Tang 70404ac7d7 SWDEV-204566 - Use ROCMSetupVersion to set package version
Change-Id: I29b9f748291b3802de65c9f29f791050853c2d12


[ROCm/clr commit: 4dcfe78e56]
2020-06-01 16:39:35 -04:00
Vlad Sytchenko 627061d190 Add ocltst build files
Change-Id: I8fcff320efb677a5efa5ee48efe1a6bbb259539f


[ROCm/clr commit: 15b318b444]
2020-06-01 14:12:51 -04:00
Vlad Sytchenko 18ce996fe2 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


[ROCm/clr commit: 75e6add24d]
2020-06-01 13:51:51 -04:00
Alex Xie a5f661537b Add more information into Readme file
Change-Id: Id3e484877eaf8123ad6c767caa5f3546c02f5d98


[ROCm/clr commit: f887aaa9d2]
2020-05-29 13:33:29 -04:00
Matt Arsenault de4f4383f6 Remove build hacks to support old manually set ROCclr variables
Change-Id: Iba8180b7260616a79723a1a9d2b0b206f178e735


[ROCm/clr commit: d191ba6585]
2020-05-27 12:53:27 -04:00
Alex Xie 02e1bd7d51 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


[ROCm/clr commit: a400051d3a]
2020-05-22 11:57:34 -04:00
Matt Arsenault 11eeb6cbf2 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


[ROCm/clr commit: aa0c163066]
2020-05-22 10:28:55 -04:00
Matt Arsenault b65ba80252 Fix include directories for cltrace
Change-Id: I8de82fa4b6ce7e1e869f1001d1710dc8673b7be5


[ROCm/clr commit: 7273fdedfe]
2020-05-19 21:41:16 -04:00
Jason Tang 1e58ddd549 Add dlerror to ICD to help future diagnosis
Change-Id: Ieb95252ab671ff666fceee3349637683078a0f89


[ROCm/clr commit: 601cf7d4bb]
2020-05-19 10:49:19 -04:00
Matt Arsenault 7bb37b41b9 Restore attempt to use find_package for ROCclr
7eda01ba broke this. This is still mostly a commit order hack until
the ROCclr change is submitted.

Change-Id: I43762963dbc66f1dc83916d2f0e9c90e4fcbf7c1


[ROCm/clr commit: 9f9d35ad86]
2020-05-18 14:34:35 -04:00
Ramesh Errabolu d09b2ebb3c Remove dependency on hsa-ext-rocr-dev package
Change-Id: I1b4032390c128e71a2f9a743b9db9b7bf7713e91


[ROCm/clr commit: 42150302e6]
2020-05-15 16:56:30 -05:00
Freddy Paul fe4475280e 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


[ROCm/clr commit: e43d427cdd]
2020-05-11 14:02:37 -07:00
Julia Jiang 6d06c2eb62 Merge "SWDEV-230009-Cltrace log is not created as expected-Update return type to vdi_agent" into amd-master-next
[ROCm/clr commit: 984d6545e6]
2020-05-11 13:50:59 -04:00
jujiang 515ef47896 SWDEV-230009-Cltrace log is not created as expected-Update return type to vdi_agent
Change-Id: Ice4083d0d3a061867f886119a4cc541e2048a328


[ROCm/clr commit: 1662b25dc6]
2020-05-08 18:56:25 -04:00
Jason Tang b07ec672bf Add dependency of hsa-rocr-dev and hsa-ext-rocr-dev
in-line with hip-on-vdi.

Change-Id: Ib0e1a5180eef409cfd0f1b5b9a42a2b663dfc0d3


[ROCm/clr commit: 372ebe7b00]
2020-05-08 13:23:37 -04:00
jujiang f3319937db SWDEV-230009-Cltrace log is not created as expected-Create dynamic library
Change-Id: I813d14c093d222c82bec6824b52cc7839f89cef5


[ROCm/clr commit: 08b66a4b1b]
2020-05-06 14:32:00 -04:00
Payam 7eda01bab6 name change vdi to rocclr
Change-Id: I59650f7082dd118c1fe92309b76a5bdb20eee3c1


[ROCm/clr commit: 94b203235e]
2020-04-30 19:06:58 -04:00
Matt Arsenault e1961eac6b Use find_package to find rocclr
Maintain compatability with current hardcoded scheme for now for
commit order convenience.

Change-Id: I0b8299fceab1cc405ae5f26a129f2f1ea3d56773


[ROCm/clr commit: 585741a040]
2020-04-28 16:41:53 -04:00
Payam Ghafari efeee416a1 Merge "adding cltrace" into amd-master-next
[ROCm/clr commit: 10de80eb17]
2020-04-28 09:48:35 -04:00
Payam caf39ab53f adding cltrace
Change-Id: I19b06f9a5954f317bbd00b5c2447ed5b6e9f30ae


[ROCm/clr commit: 50563e4544]
2020-04-28 05:49:30 -04:00
Matt Arsenault be849b740d 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


[ROCm/clr commit: 5943e4d93e]
2020-04-24 15:31:35 -04:00
Matt Arsenault 6e10ca7f0a Use cmake features to set C++ version
Change-Id: Icf5dcd781b8fecc7a39117f3c6dee97dcba9dcca


[ROCm/clr commit: fc4afbd0f9]
2020-04-21 15:22:50 -04:00
Pruthvi Madugundu ae4376f0f9 Make CMAKE_SHARED_LINKER_FLAGS appendable
Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: I3c23223270976b8746d5b4debf4d846ae0aa4c6f


[ROCm/clr commit: 8ba1527661]
2020-04-20 13:51:05 -04:00
Pruthvi Madugundu eceb5d2e82 Merge "Removing ld.so.conf entry for Opencl package" into amd-master-next
[ROCm/clr commit: bbcfe78d1c]
2020-04-20 13:50:41 -04:00
Pruthvi Madugundu fe6e14447b 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


[ROCm/clr commit: 5f710a5ecb]
2020-04-17 12:27:57 -07:00
Payam 38912263db adding License file
Change-Id: I495066010288a346b0cfaee44554a5aa8dace491


[ROCm/clr commit: 6e5b4ff46c]
2020-04-17 14:28:24 -04:00
Vlad Sytchenko 5e9504b200 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


[ROCm/clr commit: 0779b034c4]
2020-04-14 16:11:15 -04:00
Payam 335435ff84 Adding an initial Readme file
Change-Id: I4eccb10383c555c88adf30fb695b41be3f869dc5


[ROCm/clr commit: 17d5d73ff2]
2020-04-10 15:45:27 -04:00
Vladislav Sytchenko c21c9d51d2 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


[ROCm/clr commit: c4a02ce16f]
2020-04-07 18:44:01 -04:00
Payam 90f37605a8 removed unused cl.hpp in clinfo
Change-Id: Idb7fc843d380322502a249231ef60799ae291ca1


[ROCm/clr commit: 3092e7c906]
2020-04-06 19:05:24 -04:00
Saleel Kudchadker 8c8ad8153f Promote Khronos OpenCL-ICD-Loader master
master as of https://github.com/KhronosGroup/OpenCL-ICD-Loader/
commit/c7fda8bb042760b5ead8650c64445f5972a64ad7

Change-Id: Ia852f55ecf0b0aceff915991328812ed9788698f


[ROCm/clr commit: 49f3835666]
2020-04-02 17:02:58 -04:00
Saleel Kudchadker 5029a7b467 Update OpenCL 2.2 headers
Update headers as of master https://github.com/KhronosGroup/OpenCL-Headers/
commit/9dde5da9c32cbd78656a5e2417c256922e851111

Change-Id: I698a3a1b92730c52b160b51af95469c2b54331c1


[ROCm/clr commit: 4092e3dee3]
2020-04-02 02:46:20 -04:00