Commit grafiek

71 Commits

Auteur SHA1 Bericht Datum
Ranjith Ramakrishnan 94be4c2c2d SWDEV-351540 - ASAN packaging for OpenCL
Package ASAN libraries and License file for ASAN package
Suffix "asan" added to package name

Change-Id: I1ae715d2ebc50d8a1ca6336c25802b989584ce40


[ROCm/clr commit: 8a4bf91145]
2023-04-07 12:35:25 +00:00
Ranjith Ramakrishnan b2e30b6ffa SWDEV-340761 - Limit the removal of opencl conf file to package removal and provide unique name to icd file
While upgrading packaging in SLES/RHEL, the package to be upgraded is installed first, followed by cleanup of the older one
During upgrade 10-rocm-opencl.conf and icd file is getting removed as part of clean up, since the file name and path is same in different package versions.
Limit the removal of opencl conf file to  uninstall/removal of package and not during upgrade.
Used unique name for icd file

Change-Id: Ib34a78ce53e6b7d95adb70ccfd56474a297b64ca


[ROCm/clr commit: 3d350393d8]
2022-09-16 00:48:37 -07:00
Ranjith Ramakrishnan bd608d0690 SWDEV-344894 - Remove work around code
The workaround for file-reorg in opencl is not required with changes in build script.
Similar workaround code in atmi is causing installation error in spack atmi and fixed by  build scripts changes and removing the workaround

Depends-On: I2c79675ec05e1e7de2baa0a21033939f0eadac3d
Change-Id: I9b5640a7b284f1df6b3127938c51da24ce60b69e


[ROCm/clr commit: a06eda1f73]
2022-07-06 00:25:45 -07:00
Jason Tang 9e85fabc48 SWDEV-1 - Set CMAKE_POSITION_INDEPENDENT_CODE to ON
Change-Id: I95e4166e9fa96bde10a54a4842becce4ab554b22


[ROCm/clr commit: daf33f9d38]
2022-04-23 16:13:49 -04:00
Jeremy Newton dbacdbdf88 SWDEV-321116 - Allow disabling ICD loader
This patch adds an option (BUILD_ICD) to toggle the ICD loader build
with rocm-opencl. This isn't useful for official ROCm use, but distros
or users may want build rocm-opencl with their own OCL ICD loader.

The default option is BUILD_ICD=ON.
If this option is set to OFF, an OpenCL OCD loader must be installed
prior to attempting to build rocm-opencl.

E.g. distros already provide ocl icd loader packages:
sudo yum install ocd-icd-devel
sudo apt-get install ocl-icd-opencl-dev
sudo zypper install ocd-icd-devel

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I6006593eceed543cd829e8949ec2256482815673


[ROCm/clr commit: d1782940f3]
2022-04-13 18:27:13 -04:00
Jeremy Newton 6e388071ba SWDEV-321118 - Use GNUInstallDirs
Use GNUInstallDirs variables to determine the location of BINDIR,
LIBDIR, DOCDIR, and SYSCONFDIR.

Note that CMAKE_INSTALL_LIBDIR is overriden, since the default for RHEL
is lib64, but ROCm packaging wants it to be lib always. Distros or users
can easily override this.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: Ifb38263dce80d80c5ebb4eacd8e49c76bb013a44


[ROCm/clr commit: b8c124acb5]
2022-04-08 13:52:08 -04:00
Ranjith Ramakrishnan 72aef87ed5 SWDEV-291455 - File Reorganization with backward compatibility
Package installed in /opt/rocm
Warpper header files and soft link to libraries for backward compatibilty

Change-Id: Ib1edb27713dfa589369f0a03c59d3ac1b0dc8400


[ROCm/clr commit: c110ac233f]
2022-02-27 15:36:02 -08:00
Jeremy Newton 87809a0387 SWDEV-1 - Fix cmake build
CPACK_PACKAGING_INSTALL_PREFIX is defined in the wrong location.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: Id8ce6beb1d18878c9132cab335cb372a53cc0ee8


[ROCm/clr commit: 9c1f2da1a2]
2022-02-09 16:09:25 -05:00
Ashutosh Mishra 1f10c39e2a SWDEV-306262 - Fix RUNPATH
RUNPATH was not changed to correct ROCM_RPATH
Packaged proper binaries after RUNPATH correction

Signed-off-by: Ashutosh Mishra <Ashutosh.Mishra@amd.com>

Change-Id: I97443cc0d6cb1ecf7352e3c83ae0fe38a8f339bf


[ROCm/clr commit: e3fe3a6109]
2022-02-08 15:14:05 -08:00
Freddy Paul 9b9669d29c SWDEV-309024 - Providing debug information for released libraries
Current packaging structure using custom command fail to work for
generating debug symbols.Hence changing the packaging to more
conventional way of using single CMakeLists.txt and split packages
using components like binary, dev and icd

Change-Id: I7fcf5f8afc3602f77576f2a13aa4916acb10888b


[ROCm/clr commit: 8fa82f6e64]
2022-01-26 08:14:05 -08:00
Jeremy Newton de579ad9d8 SWDEV-316087 - Fix ROCM_DEP_ROCMCORE logic
ROCM_DEP_ROCMCORE is not passed to the packaging cmake files, so
rocm-core is never added to the dependency list, even if it's set.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I57ec415b5e2b816f8bc226a66643ca0a808e9a35


[ROCm/clr commit: 3898530e2c]
2021-12-22 11:07:58 -05:00
Jeremy Newton fb6409b090 SWDEV-306262 - Add ocl-icd subpackages
These packages contains only the ICD loader (libopencl.so). This allows
legacy opencl (PAL) to use these packages instead of duplicating these
packages in both builds.

This also resolves a licensing issue where OCL ICD is licensed as
Apache, while opencl is MIT. Having a separate package avoid license
confusion.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I3dd29239841da7f5dc767419a9bc35d9046e9936


[ROCm/clr commit: cb1e7cd48d]
2021-12-08 16:15:59 -05:00
taosang2 6b3e3bf6c6 SWDEV-1 - Add EMU_ENV option
Fix FEAT-39125
Add EMU_ENV option. If it is ON, the building is for
emulation environment, thus some logics can be adjusted
to match emulation environment. If it is OFF, the
building is for regular environment.
Currently only ocltst will use the option. But it can
be used for other modules.

Change-Id: I54e1bc1309e82794b41fca2ae1f01f004138dced


[ROCm/clr commit: 76c6dcd558]
2021-12-03 10:03:00 -05:00
Jason Tang 267c4fbc62 SWDEV-301289 - Enable building and installing ocltst on Windows
Change-Id: I512dbcb96dd6a7c52a5ebad819043fdd0138215d


[ROCm/clr commit: b1e9a4227c]
2021-10-25 14:10:15 -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 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 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 a24ec756d0 SWDEV-277771 - Build opencl with c++ standard 14
Change-Id: I11c72b230320761f775e23816634b55ceaccb65e


[ROCm/clr commit: 2727d7047a]
2021-03-22 11:30:29 -04: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
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
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
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
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 3c0b0d9d92 Not to use fixnames
Change-Id: I50c9503cad1fc072edec989a4f82a27bb7bb3909


[ROCm/clr commit: 4666113db0]
2020-06-28 18:57:16 -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 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
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
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 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
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
Payam 7eda01bab6 name change vdi to rocclr
Change-Id: I59650f7082dd118c1fe92309b76a5bdb20eee3c1


[ROCm/clr commit: 94b203235e]
2020-04-30 19:06:58 -04:00
Payam caf39ab53f adding cltrace
Change-Id: I19b06f9a5954f317bbd00b5c2447ed5b6e9f30ae


[ROCm/clr commit: 50563e4544]
2020-04-28 05:49:30 -04:00
Aaron Enye Shi 908396dca0 SWDEV-227621 - Fix OpenCL CMake Packaging
Update the packaging code to be CMake 3.5 compatible for CI. Create two
packages rocm-opencl and rocm-opencl-dev on Ubuntu and CentOS. Add
proper versioning into naming.

Change-Id: I116081b7f6f7efa4be43ab3a66e4d3bff0589298


[ROCm/clr commit: b3d035b1dc]
2020-03-18 15:22:11 -04:00
Payam 47b18ccf54 clean up
Change-Id: I6520e9b796675cd8879c1116e7739764056a2666


[ROCm/clr commit: e65dc6f8be]
2020-02-24 14:32:13 -05:00
Laurent Morichetti 8e9b69d1b1 Merge branch 'origin/pghafari/opencl' into lmoriche/amd-master-next
[ROCm/clr commit: d4c39b88c5]
2020-02-03 13:26:46 -08:00
foreman 1ff7032645 P4 to Git Change 2028995 by jatang@jatang_win_pal_lc on 2019/11/12 11:56:20
SWDEV-207835 - Implement uniform package versioning for cmake version of OpenCL.

	Need to generate the same style of packages name as the Makefile version does.

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#29 edit


[ROCm/clr commit: 9a4d0fea49]
2019-11-12 12:04:53 -05:00
foreman 2a7386e3dd P4 to Git Change 1978446 by kzhuravl@kzhuravl-spot-ocl on 2019/08/05 11:37:30
SWDEV-79445 - OCL generic changes and code clean-up

	Bring cmake changes from gerrit (reviewed and tested on gerrit)

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#28 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#7 edit


[ROCm/clr commit: b5025c1924]
2019-08-05 11:41:06 -04:00
foreman 1b8acf2c44 P4 to Git Change 1977064 by kzhuravl@kzhuravl-spot-ocl on 2019/08/01 12:38:51
SWDEV-79445 - OCL generic changes and code clean-up

	- Changes to allow the use of newer icd revisions - http://git.amd.com:8080/c/compute/ec/opencl/+/248346

	Reviewed on gerrit
	Tested locally

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#27 edit


[ROCm/clr commit: 1e56c389a8]
2019-08-01 12:50:41 -04:00
foreman d9b6b4f0c6 P4 to Git Change 1977054 by kzhuravl@kzhuravl-spot-ocl on 2019/08/01 12:32:41
SWDEV-79445 - OCL generic changes and code clean-up

	- Fix COMGR+CMAKE combination - http://git.amd.com:8080/c/compute/ec/opencl/+/247843
	- Fix and clean up packaging (cmake) - http://git.amd.com:8080/c/compute/ec/opencl/+/247844

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#26 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#19 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#16 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#104 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#6 edit


[ROCm/clr commit: 2b391e2148]
2019-08-01 12:44:10 -04:00
foreman c57f496ee5 P4 to Git Change 1975195 by pghafari@pghafari-gera-win10 on 2019/07/29 14:54:55
SWDEV-197122 - updated cmake for hip-vdi-rorc

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#25 edit
... //depot/stg/opencl/drivers/opencl/api/hip/CMakeLists.txt#2 edit


[ROCm/clr commit: 5a8743f5a7]
2019-07-29 15:01:09 -04:00
foreman 65dbba594d P4 to Git Change 1971654 by kzhuravl@kzhuravl-spot-ocl on 2019/07/22 17:15:57
SWDEV-79445 - Bring cmake related changes from git

	http://git.amd.com:8080/c/compute/ec/opencl/+/229473
	http://git.amd.com:8080/c/compute/ec/opencl/+/229474
	http://git.amd.com:8080/c/compute/ec/opencl/+/233268

	+

	Payam's changes for comgr

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#24 edit
... //depot/stg/opencl/drivers/opencl/DEB/postinst#1 add
... //depot/stg/opencl/drivers/opencl/DEB/prerm#1 add
... //depot/stg/opencl/drivers/opencl/RPM/rpm_post#1 add
... //depot/stg/opencl/drivers/opencl/RPM/rpm_postun#1 add
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#18 edit
... //depot/stg/opencl/drivers/opencl/cmake/modules/FindROCR.cmake#3 edit
... //depot/stg/opencl/drivers/opencl/cmake/modules/FindROCT.cmake#1 add
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#15 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/CMakeLists.txt#20 edit


[ROCm/clr commit: 29a575e268]
2019-07-22 17:19:35 -04:00
foreman e373f03ca8 P4 to Git Change 1968653 by marsenau@marsenau-fiji on 2019/07/16 17:57:30
SWDEV-79445 - Don't use amdgizcl. This has been unnecessary for a long time.

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#23 edit


[ROCm/clr commit: d5b18e32f4]
2019-07-16 17:59:51 -04:00
foreman b0f3fd3641 P4 to Git Change 1753206 by kzhuravl@bos-10-kzhuravl-sc on 2019/03/07 21:36:25
SWDEV-125823 - Use ccache if ROCM_OPENCL_CCACHE_BUILD=ON

	This is a preparation for enabling ccache in our Jenkins jobs.

	Change-Id: I3d0ae3fbf0f14afdd828fc51120f24b130ee105d

	Reviewed and tested: http://git.amd.com:8080/c/compute/ec/opencl/+/208573

Affected files ...

... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#22 edit


[ROCm/clr commit: 435401ceb7]
2019-03-07 21:52:47 -05:00