This is the first step to remove rocm-ocl-icd.
We don't build amd icd after this commit.
We still need to remove header files usage in future steps.
Change-Id: Ic4ac5476180f9ef2ce87b62891c08b28d6c9bfd2
This reverts commit 5f68a4531a.
Reason for revert: due to windows staging branch using Opencl-icd-loader master
Change-Id: I9cca7564a21de1733665a34da6f0322aa3b886e7
Build script was passing relative path for setting the RUNPATH. But clinfo is overriding it and using absolute paths
Removed the same from source code
Change-Id: I505e7fdc84c53d147f3afbc6c4133f906de2110f
The explicit RUNPATH addtion has been
revoked after the file reorg. Hence
the rpath for discovery of the libs
has to be taken care by individual binaries
Current patch adds the run path for
descovery of the libOpenCL.so
Signed-off-by: Ashutosh Mishra <ashutosh.mishra@amd.com>
Change-Id: Ia3bf9202bea78ecfdb881e40b0eb7a0d4a303ed3
ATI_OS_WIN -> _WIN32
ATI_OS_LINUX -> __linux__
We should not rely on non-standard macros for platform detections.
Change-Id: If1d06e2e1187268df62a59609ea5496ab7eb709d
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
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
Don't use hardcoded install destinations. CMake will decide where things
should be installed based on platform.
Change-Id: Ifcf956181d3efb32d4ce6191a89c1ea225d0e8cc
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
This reverts commit 932c83fe8f.
Reason for revert: need to update other projects (linuxpro & marnier)
Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580
SWDEV-1 - Also catch clGetPlatformIDs error, so clinfo won't get a page fault when no platform is found.
Instead clinfo now shows:
ERROR: clGetPlatformIDs(-1001)
Affected files ...
... //depot/stg/opencl/drivers/opencl/tools/clinfo/clinfo.cpp#5 edit
SWDEV-102733 - Update some CMakeLists.txt files:
- when setting CMAKE_CXX_FLAGS, append to it rather than overwriting it.
- some linker flags, -Wl,--unresolved-symbols=report-all being one of them, requires -shared-libasan if using -fsanitize=address.
Affected files ...
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/CMakeLists.txt#13 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/CMakeLists.txt#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#9 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#5 edit
SWDEV-102733 - Bring CMakeLists.txt in sync with open source
- Remove extra empty lines
- Add new lines at the end of files
Affected files ...
... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#17 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#4 edit
SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
- Enable building the ICD and clinfo.
Affected files ...
... //depot/stg/opencl/drivers/opencl/CMakeLists.txt#11 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/CMakeLists.txt#2 edit
SWDEV-102733 - [OCL-LC-ROCm] Cmake build Write CMakeLists.txt to enable building with and without the DK environment
- Make it possible to use cl2.hpp
Affected files ...
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl2.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/tools/clinfo/clinfo.cpp#3 edit