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

rocclr/cmake/modules/FindROCR.cmake

@@ -1,23 +1,16 @@
-# - Try to find the ROCm Runtime.
-# Once done this will define
-#  ROCR_FOUND - System has the ROCR installed
-#  ROCR_INCLUDE_DIRS - The ROCR include directories
-#  ROCR_LIBRARIES - The libraries needed to use the ROCR
-
-find_path(ROCR_INCLUDE_DIR hsa.h
-          HINTS /opt/rocm/include /opt/rocm/hsa/include
-          PATH_SUFFIXES hsa)
-
-find_library(ROCR_LIBRARY hsa-runtime64
-             HINTS /opt/rocm/lib  /opt/rocm/hsa/lib)
+# Try to find ROCR (Radeon Open Compute Runtime)
+#
+# Once found, this will define:
+#   - ROCR_FOUND     - ROCR status (found or not found)
+#   - ROCR_INCLUDES  - Required ROCR include directories
+#   - ROCR_LIBRARIES - Required ROCR libraries
+find_path(FIND_ROCR_INCLUDES hsa.h HINTS /opt/rocm/include /opt/rocm/hsa/include PATH_SUFFIXES hsa)
+find_library(FIND_ROCR_LIBRARIES hsa-runtime64 HINTS /opt/rocm/lib /opt/rocm/hsa/lib)
 
 include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set ROCR_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(ROCR  DEFAULT_MSG
-                                  ROCR_LIBRARY ROCR_INCLUDE_DIR)
+find_package_handle_standard_args(ROCR DEFAULT_MSG
+                                  FIND_ROCR_INCLUDES FIND_ROCR_LIBRARIES)
+mark_as_advanced(FIND_ROCR_INCLUDES FIND_ROCR_LIBRARIES)
 
-mark_as_advanced(ROCR_INCLUDE_DIR ROCR_LIBRARY)
-
-set(ROCR_LIBRARIES ${ROCR_LIBRARY})
-set(ROCR_INCLUDE_DIRS ${ROCR_INCLUDE_DIR})
+set(ROCR_INCLUDES ${FIND_ROCR_INCLUDES})
+set(ROCR_LIBRARIES ${FIND_ROCR_LIBRARIES})

rocclr/cmake/modules/FindROCT.cmake

@@ -0,0 +1,16 @@
+# Try to find ROCT (Radeon Open Compute Thunk)
+#
+# Once found, this will define:
+#   - ROCT_FOUND     - ROCT status (found or not found)
+#   - ROCT_INCLUDES  - Required ROCT include directories
+#   - ROCT_LIBRARIES - Required ROCT libraries
+find_path(FIND_ROCT_INCLUDES hsakmt.h HINTS /opt/rocm/include)
+find_library(FIND_ROCT_LIBRARIES hsakmt HINTS /opt/rocm/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ROCT DEFAULT_MSG
+                                  FIND_ROCT_INCLUDES FIND_ROCT_LIBRARIES)
+mark_as_advanced(FIND_ROCT_INCLUDES FIND_ROCT_LIBRARIES)
+
+set(ROCT_INCLUDES ${FIND_ROCT_INCLUDES})
+set(ROCT_LIBRARIES ${FIND_ROCT_LIBRARIES})