Merge branch 'origin/pghafari/hip-vdi' into lmoriche/amd-master-next

Change-Id: I22c145d39f430ca571a981687bcb034ea6e3b8a2


[ROCm/hip commit: a8b81e96b4]

projects/hip/cmake/FindROCR.cmake

@@ -0,0 +1,16 @@
+# 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)
+find_package_handle_standard_args(ROCR DEFAULT_MSG
+                                  FIND_ROCR_INCLUDES FIND_ROCR_LIBRARIES)
+mark_as_advanced(FIND_ROCR_INCLUDES FIND_ROCR_LIBRARIES)
+
+set(ROCR_INCLUDES ${FIND_ROCR_INCLUDES})
+set(ROCR_LIBRARIES ${FIND_ROCR_LIBRARIES})

projects/hip/cmake/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})