SWDEV-273235 - Initial support for Windows CMake

This change is tied to the ROCclr cmake rework. ROCclr will now be built
as part of HIP itself.

All the dependencies on comgr and rocr have been moved into ROCclr
itself. This allows HIP to pull in all the required compiler/runtime
dependencies by simply linking against ROCclr. Note that ROCclr needs to
be configured from HIP cmake command line. If not, we will default to
LC + ROCr support.

Since HIP depends on ROCclr and ROCclr depends on OpenCL, HIP will
transitevly pull in all the required OpenCL headers. No need to keep a
local copy of them anymore.

Change-Id: Ib39f4929e88da1248be962490c150b10fc7abd3a

rocclr/CMakeLists.txt

@@ -18,57 +18,175 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-#project("hip")
 cmake_minimum_required(VERSION 3.5.1)
 
-option(ADDRESS_SANITIZER "Build Address Sanitizer" OFF)
-if (ADDRESS_SANITIZER)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
-    if (BUILD_SHARED_LIBS)
-        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" -fsanitize=address)
-        set (CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS}" -shared-libsan)
-    else ()
-        set (CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}" -fsanitize=address)
-        set (CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}" -static-libsan)
-    endif ()
-endif ()
-
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-keep-memory -Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/hip_hcc.map.in")
-
-set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/lib)
-
+# TODO, this install logic is hacky. We should not be manually specifying install locations.
+# Cmake should handle this for us based on the target properties.
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/lib)
 set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
 set(CONFIG_PACKAGE_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/hip)
 
-find_package(PythonInterp REQUIRED)
+if(ADDRESS_SANITIZER)
+  set(ASAN_LINKER_FLAGS "-fsanitize=address")
+  set(ASAN_COMPILER_FLAGS "-fno-omit-frame-pointer -fsanitize=address")
 
-add_definitions( -D__HIP_PLATFORM_AMD__ -DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=0 -DCL_TARGET_OPENCL_VERSION=220 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER -DUSE_PROF_API)
+  if(NOT CMAKE_COMPILER_IS_GNUCC)
+    if(BUILD_SHARED_LIBS)
+      set(ASAN_LINKER_FLAGS "${ASAN_LINKER_FLAGS} -shared-libsan")
+    else()
+      set(ASAN_LINKER_FLAGS "${ASAN_LINKER_FLAGS} -static-libsan")
+    endif()
+  endif()
 
-if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
-  add_definitions(-DDEBUG)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ASAN_COMPILER_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ASAN_COMPILER_FLAGS}")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_LINKER_FLAGS} -s")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_LINKER_FLAGS}")
 endif()
 
-if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
-   (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang"))
-  add_definitions(
-    # Enabling -Wextra or -pedantic will cause
-    # thousands of warnings. Keep things simple for now.
-    -Wall
-    # This one seems impossible to fix for now.
-    # There are hundreds of instances of unused vars/functions
-    # throughout the code base.
-    -Wno-unused-variable
-    -Wno-unused-function)
+option(BUILD_SHARED_LIBS "Build the shared library" ON)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+find_package(ROCclr)
+
+if(BUILD_SHARED_LIBS)
+  add_library(amdhip SHARED)
+  # Windows doesn't have a strip utility, so CMAKE_STRIP won't be set.
+  if((CMAKE_BUILD_TYPE STREQUAL "Release") AND NOT ("${CMAKE_STRIP}" STREQUAL ""))
+    add_custom_command(TARGET amdhip POST_BUILD COMMAND ${CMAKE_STRIP} $<TARGET_FILE:amdhip>)
+  endif()
+else()
+  add_library(amdhip STATIC $<TARGET_OBJECTS:rocclr>)
 endif()
 
-set(USE_PROF_API "1")
+set_target_properties(amdhip PROPERTIES
+  CXX_STANDARD 14
+  CXX_STANDARD_REQUIRED ON
+  CXX_EXTENSIONS OFF
+  POSITION_INDEPENDENT_CODE ON)
 
-# Need to add /opt/rocm/llvm to package search path since ROCclr will
-# find package amd_comgr and amd_comgr will find package llvm/clang.
-# Without this, the system llvm/clang at /usr/local may be found.
-list(APPEND CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/opt/rocm/llvm")
-find_package(ROCclr REQUIRED CONFIG)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set_target_properties(amdhip PROPERTIES OUTPUT_NAME "amdhip64")
+else()
+  set_target_properties(amdhip PROPERTIES OUTPUT_NAME "amdhip32")
+endif()
+
+if(BUILD_SHARED_LIBS)
+  set_target_properties(amdhip PROPERTIES
+     VERSION ${HIP_LIB_VERSION_STRING}
+     SOVERSION ${HIP_LIB_VERSION_MAJOR})
+endif()
+
+target_sources(amdhip PRIVATE
+  cl_gl.cpp
+  cl_lqdflash_amd.cpp
+  fixme.cpp
+  hip_activity.cpp
+  hip_code_object.cpp
+  hip_context.cpp
+  hip_device_runtime.cpp
+  hip_device.cpp
+  hip_error.cpp
+  hip_event.cpp
+  hip_fatbin.cpp
+  hip_global.cpp
+  hip_graph_internal.cpp
+  hip_graph.cpp
+  hip_hmm.cpp
+  hip_intercept.cpp
+  hip_memory.cpp
+  hip_module.cpp
+  hip_peer.cpp
+  hip_platform.cpp
+  hip_profile.cpp
+  hip_rtc.cpp
+  hip_stream_ops.cpp
+  hip_stream.cpp
+  hip_surface.cpp
+  hip_texture.cpp)
+
+if(WIN32)
+  target_sources(amdhip PRIVATE
+    cl_d3d9.cpp
+    cl_d3d10.cpp
+    cl_d3d11.cpp)
+endif()
+
+if(BUILD_SHARED_LIBS)
+  if(WIN32)
+    target_sources(amdhip PRIVATE amdhip.def)
+  else()
+    set_target_properties(amdhip PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_LIST_DIR}/hip_hcc.map.in")
+  endif()
+endif()
+
+target_include_directories(amdhip
+  PRIVATE
+    ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_BINARY_DIR}/include)
+
+target_compile_definitions(amdhip PRIVATE __HIP_PLATFORM_AMD__)
+
+target_link_libraries(amdhip PRIVATE ${CMAKE_DL_LIBS})
+# Additional dependencies for hipRTC
+if(WIN32)
+  target_link_libraries(amdhip PRIVATE Dbghelp.lib)
+endif()
+
+# Note in static case we cannot link against rocclr.
+# If we would, we'd also have to export rocclr and have hipcc pass it to the linker.
+if(BUILD_SHARED_LIBS)
+  target_link_libraries(amdhip PRIVATE rocclr)
+else()
+  target_compile_definitions(amdhip PRIVATE $<TARGET_PROPERTY:rocclr,COMPILE_DEFINITIONS>)
+  target_include_directories(amdhip PRIVATE $<TARGET_PROPERTY:rocclr,INCLUDE_DIRECTORIES>)
+endif()
+
+# Short-Term solution for pre-compiled headers for online compilation
+# Enable pre compiled header
+if(__HIP_ENABLE_PCH)
+  find_package(LLVM REQUIRED CONFIG
+    PATHS
+      /opt/rocm/llvm
+    PATH_SUFFIXES
+      lib/cmake/llvm)
+  set(LLVM_ROOT "${LLVM_DIR}/../../..")
+
+  execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${LLVM_ROOT}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
+  if (EMBED_PCH_RC AND NOT EMBED_PCH_RC EQUAL 0)
+    message(FATAL_ERROR "Failed to embed PCH")
+  endif()
+
+  target_compile_definitions(amdhip PRIVATE __HIP_ENABLE_PCH)
+  target_sources(amdhip PRIVATE ${CMAKE_BINARY_DIR}/hip_pch.o)
+endif()
+
+# Enable preprocessed hiprtc-builtins library
+if(__HIP_ENABLE_RTC)
+  find_package(LLVM REQUIRED CONFIG
+    PATHS
+      /opt/rocm/llvm
+    PATH_SUFFIXES
+      lib/cmake/llvm)
+  message(STATUS "llvm found at ${LLVM_DIR}.")
+  set(LLVM_ROOT "${LLVM_DIR}/../../..")
+
+  if(WIN32)
+    set(HIPRTC_LIB_NAME "hiprtc-builtins64_${HIP_LIB_VERSION_MAJOR}${HIP_LIB_VERSION_MINOR}.dll")
+  else()
+    set(HIPRTC_LIB_NAME "libhiprtc-builtins.so.${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}")
+  endif()
+  execute_process(
+    COMMAND sh -c "mkdir -p ${PROJECT_BINARY_DIR}/lib; ${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${LLVM_ROOT} -r ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME}"
+    COMMAND_ECHO STDERR
+    RESULT_VARIABLE EMBED_RTC_RC
+  )
+  if (EMBED_RTC_RC AND NOT EMBED_RTC_RC EQUAL 0)
+    message(FATAL_ERROR "Failed to create hiprtc shared lib")
+  endif()
+  install(FILES ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME} DESTINATION lib)
+endif()
 
 #############################
 # Profiling API support
@@ -80,6 +198,7 @@ set(PROF_API_SRC "${CMAKE_CURRENT_SOURCE_DIR}")
 set(PROF_API_GEN "${CMAKE_CURRENT_SOURCE_DIR}/hip_prof_gen.py")
 set(PROF_API_LOG "${PROJECT_BINARY_DIR}/hip_prof_gen.log.txt")
 
+find_package(PythonInterp REQUIRED)
 add_custom_command(OUTPUT ${PROF_API_STR}
   COMMAND ${PYTHON_EXECUTABLE} ${PROF_API_GEN} -v -t --priv ${OPT_PROF_API} ${PROF_API_HDR} ${PROF_API_SRC} ${PROF_API_STR}
   OUTPUT_FILE ${PROF_API_LOG}
@@ -90,116 +209,11 @@ add_custom_target(gen-prof-api-str-header ALL
   DEPENDS ${PROF_API_STR}
   SOURCES ${PROF_API_HDR})
 
+set_target_properties(amdhip PROPERTIES PUBLIC_HEADER ${PROF_API_STR})
+
+option(USE_PROF_API ON "Enable roctracer integration")
 # Enable profiling API
-if(NOT DEFINED ROCclr_DIR OR NOT DEFINED LIBOCL_STATIC_DIR OR NOT DEFINED LIBROCclr_STATIC_DIR )
-	#	message(FATAL_ERROR "define ROCclr_DIR, LIBOCL_STATIC_DIR\n")
-
-endif()
-
-#APPEND default path for CMAKE_PREFIX_PATH
-#User provided will be searched first since defualt path is at end.
-#Custom install path can be provided at compile time as cmake parameter(-DCMAKE_PREFIX_PATH="")
-#/opt/rocm:default:For amd_comgr,hsa-runtime64
-#/opt/rocm/llvm/:default:For llvm/clang pulled in as dependency from hsa/comgr
-list( APPEND CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "/opt/rocm")
-
-list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
-set(CMAKE_MODULE_PATH${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-
-message(STATUS "Hsa runtime found at ${hsa-runtime64_DIR}.")
-message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
-
-find_package(LLVM REQUIRED CONFIG
-   PATHS
-     /opt/rocm/llvm)
-# find_package(LLVM) returns the lib/cmake/llvm location. We require the root.
-set(HIP_LLVM_ROOT "${LLVM_DIR}/../../.." CACHE PATH "LLVM Root Directory")
-message(STATUS "llvm found at ${LLVM_DIR}.")
-
-add_library(hip64 OBJECT
- hip_context.cpp
- hip_code_object.cpp
- hip_device.cpp
- hip_device_runtime.cpp
- hip_error.cpp
- hip_event.cpp
- hip_fatbin.cpp
- hip_global.cpp
- hip_hmm.cpp
- hip_memory.cpp
- hip_module.cpp
- hip_peer.cpp
- hip_platform.cpp
- hip_profile.cpp
- hip_stream.cpp
- hip_stream_ops.cpp
- hip_surface.cpp
- hip_texture.cpp
- hip_activity.cpp
- hip_intercept.cpp
- hip_rtc.cpp
- cl_gl.cpp
- cl_lqdflash_amd.cpp
- fixme.cpp
- hip_graph.cpp
- hip_graph_internal.cpp
- )
-set_target_properties(hip64 PROPERTIES POSITION_INDEPENDENT_CODE ON)
-
-target_include_directories(hip64
-  PUBLIC
-    ${PROJECT_SOURCE_DIR}/include
-    ${PROJECT_BINARY_DIR}/include
-  PRIVATE
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/amdocl
-    ${ROCR_INCLUDES}
-    $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>)
-target_compile_definitions(hip64
-  PRIVATE
-   $<TARGET_PROPERTY:amd_comgr,INTERFACE_COMPILE_DEFINITIONS>)
-
-if(ROCclr_FOUND)
-  message(STATUS "ROCclr found at ${ROCclr_DIR}")
-  target_include_directories(hip64
-    PRIVATE
-      $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_INCLUDE_DIRECTORIES>)
-  target_compile_definitions(hip64
-    PRIVATE
-      $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_COMPILE_DEFINITIONS>)
-endif()
-
-# Short-Term solution for pre-compiled headers for online compilation
-# Enable pre compiled header
-if(__HIP_ENABLE_PCH)
-    execute_process(COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT} ${HSA_PATH}" COMMAND_ECHO STDERR RESULT_VARIABLE EMBED_PCH_RC)
-    if (EMBED_PCH_RC AND NOT EMBED_PCH_RC EQUAL 0)
-      message(FATAL_ERROR "Failed to embed PCH")
-    endif()
-    add_definitions(-D__HIP_ENABLE_PCH)
-endif()
-
-# Enable preprocessed hiprtc-builtins library
-if(__HIP_ENABLE_RTC)
-  if(WIN32)
-    set(HIPRTC_LIB_NAME "hiprtc-builtins64_${HIP_LIB_VERSION_MAJOR}${HIP_LIB_VERSION_MINOR}.dll")
-  else()
-    set(HIPRTC_LIB_NAME "libhiprtc-builtins.so.${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}")
-  endif()
-  execute_process(
-    COMMAND sh -c "mkdir -p ${PROJECT_BINARY_DIR}/lib; ${CMAKE_CURRENT_SOURCE_DIR}/../bin/hip_embed_pch.sh ${PROJECT_BINARY_DIR}/include ${PROJECT_SOURCE_DIR}/include ${HIP_LLVM_ROOT} ${HSA_PATH} -r ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME}"
-    COMMAND_ECHO STDERR
-    RESULT_VARIABLE EMBED_RTC_RC
-  )
-  if (EMBED_RTC_RC AND NOT EMBED_RTC_RC EQUAL 0)
-    message(FATAL_ERROR "Failed to create hiprtc shared lib")
-  endif()
-  install(FILES ${PROJECT_BINARY_DIR}/lib/${HIPRTC_LIB_NAME} DESTINATION lib)
-endif()
-
-# Enable profiling API
-if(USE_PROF_API EQUAL 1)
+if(USE_PROF_API)
   find_path(PROF_API_HEADER_DIR prof_protocol.h
     HINTS
       ${PROF_API_HEADER_PATH}
@@ -210,88 +224,47 @@ if(USE_PROF_API EQUAL 1)
 
   if(NOT PROF_API_HEADER_DIR)
     message(WARNING "Profiling API header not found. Disabling roctracer integration. Use -DPROF_API_HEADER_PATH=<path to prof_protocol.h header>")
-    else()
-      target_compile_definitions(hip64 PUBLIC USE_PROF_API=1)
-      target_include_directories(hip64 PUBLIC ${PROF_API_HEADER_DIR})
-      message(STATUS "Profiling API: ${PROF_API_HEADER_DIR}")
-    endif()
+  else()
+    target_compile_definitions(amdhip PUBLIC USE_PROF_API=1)
+    target_include_directories(amdhip PUBLIC ${PROF_API_HEADER_DIR})
+    message(STATUS "Profiling API: ${PROF_API_HEADER_DIR}")
+  endif()
 endif()
 
-set_target_properties(
-    hip64 PROPERTIES
-        CXX_STANDARD 14
-        CXX_STANDARD_REQUIRED ON
-        CXX_EXTENSIONS OFF
-        )
-add_dependencies(hip64 gen-prof-api-str-header)
+add_dependencies(amdhip gen-prof-api-str-header)
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
+add_custom_command(TARGET amdhip POST_BUILD COMMAND
+  ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/.hipInfo ${PROJECT_BINARY_DIR}/lib/.hipInfo)
+add_custom_command(TARGET amdhip POST_BUILD COMMAND
+  ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include)
 
+INSTALL(PROGRAMS $<TARGET_FILE:amdhip> DESTINATION lib COMPONENT MAIN)
 
-if(${BUILD_SHARED_LIBS})
-
-  add_library(amdhip64
-      $<TARGET_OBJECTS:hip64>
-  )
-
-  set_target_properties(
-      amdhip64 PROPERTIES
-         VERSION ${HIP_LIB_VERSION_STRING}
-         SOVERSION ${HIP_LIB_VERSION_MAJOR}
-      )
-
-  set_target_properties(hip64 PROPERTIES PUBLIC_HEADER ${PROF_API_STR})
-
-else()
-
-   add_library(amdhip64 STATIC
-      $<TARGET_OBJECTS:hip64>
-      )
-
-endif()
-
-set_target_properties(amdhip64 PROPERTIES LINK_FLAGS_RELEASE -s)
-set_target_properties(amdhip64 PROPERTIES PUBLIC_HEADER ${PROF_API_STR})
 add_library(host INTERFACE)
-target_link_libraries(host INTERFACE amdhip64)
-
+target_link_libraries(host INTERFACE amdhip)
+  
 add_library(device INTERFACE)
 target_link_libraries(device INTERFACE host)
 
-# Short-Term solution for pre-compiled headers for online compilation
-if(__HIP_ENABLE_PCH)
-  target_sources(amdhip64 PRIVATE ${CMAKE_BINARY_DIR}/hip_pch.o)
-endif()
-
-target_link_libraries(amdhip64 PRIVATE amdrocclr_static Threads::Threads dl hsa-runtime64::hsa-runtime64)
-add_custom_command(TARGET amdhip64 POST_BUILD COMMAND
-    ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/.hipInfo ${PROJECT_BINARY_DIR}/lib/.hipInfo)
-add_custom_command(TARGET amdhip64 POST_BUILD COMMAND cp -rf
-    ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/)
-
-INSTALL(PROGRAMS $<TARGET_FILE:amdhip64> DESTINATION lib COMPONENT MAIN)
-
-INSTALL(TARGETS amdhip64 host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS amdhip host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE hip::)
 
-INSTALL(TARGETS amdhip64 host device EXPORT hip-lang-targets DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS amdhip host device EXPORT hip-lang-targets DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(EXPORT hip-lang-targets DESTINATION ${CONFIG_LANG_PACKAGE_INSTALL_DIR} NAMESPACE hip-lang::)
 
+if(NOT WIN32)
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(
-    ${PROJECT_SOURCE_DIR}/hip-lang-config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/hip-lang-config.cmake
-    INSTALL_DESTINATION ${CONFIG_LANG_PACKAGE_INSTALL_DIR}
-    PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR
-    )
+  ${PROJECT_SOURCE_DIR}/hip-lang-config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/hip-lang-config.cmake
+  INSTALL_DESTINATION ${CONFIG_LANG_PACKAGE_INSTALL_DIR}
+  PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR)
 
 write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/hip-lang-config-version.cmake
-    VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_GITDATE}"
-    COMPATIBILITY SameMajorVersion
-    )
+  ${CMAKE_CURRENT_BINARY_DIR}/hip-lang-config-version.cmake
+  VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_GITDATE}"
+  COMPATIBILITY SameMajorVersion)
 install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/hip-lang-config.cmake
@@ -299,3 +272,4 @@ install(
     DESTINATION
     ${CONFIG_LANG_PACKAGE_INSTALL_DIR}/
     )
+endif()

rocclr/cl_d3d9.cpp

@@ -0,0 +1,218 @@
+/* Copyright (c) 2010-present Advanced Micro Devices, Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE. */
+
+/* $Revision$ on $Date$ */
+
+#ifndef __OPENCL_CL_D3D9_AMD_H
+#define __OPENCL_CL_D3D9_AMD_H
+
+#include "cl_common.hpp"
+#include "platform/context.hpp"
+#include "platform/memory.hpp"
+
+#include <utility>
+
+/* cl_amd_d3d9_sharing extension    */
+#define cl_amd_d3d9_sharing 1
+
+/* cl_amd_d3d9_sharing error codes */
+#define CL_INVALID_D3D9_DEVICE_KHR              -1021
+#define CL_INVALID_D3D9_RESOURCE_KHR            -1022
+
+/* cl_amd_d3d9_sharing enumerations */
+#define CL_CONTEXT_D3D9_DEVICE_KHR              0x4039
+
+namespace amd
+{
+typedef struct
+{
+    union
+    {
+        UINT ByteWidth;
+        UINT Width;
+    };
+    UINT Height;
+    UINT Depth;
+} D3D9ObjSize_t;
+
+typedef struct
+{
+    D3D9ObjSize_t       objSize_;
+    D3DFORMAT           d3dFormat_;
+    D3DRESOURCETYPE     resType_;
+    UINT                usage_;
+    D3DPOOL             d3dPool_;
+    D3DMULTISAMPLE_TYPE msType_;
+    UINT                msQuality_;
+    UINT                mipLevels_;
+    UINT                fvf_;
+    RECT                surfRect_;
+} D3D9ObjDesc_t;
+
+typedef struct d3d9ResInfo {
+    cl_dx9_surface_info_khr surfInfo;
+    cl_uint                 surfPlane;
+} TD3D9RESINFO;
+
+
+//typedef std::pair<cl_dx9_surface_info_khr, D3D9Object*> TD3D9OBJINFO;
+
+//! Class D3D9Object keeps all the info about the D3D9 object
+//! from which the CL object is created
+class D3D9Object : public InteropObject
+{
+private:
+    IDirect3DSurface9* pD3D9Aux_;
+    cl_int  cliChecksum_;
+    bool releaseResources_;
+    static bool createSharedResource(D3D9Object& obj);
+    static std::vector<std::pair<TD3D9RESINFO, TD3D9RESINFO>> resources_;
+
+    //!Global lock
+    static Monitor              resLock_;
+    cl_uint                     surfPlane_;
+    cl_dx9_surface_info_khr     surfInfo_;
+
+protected:
+    IDirect3DSurface9*  pD3D9Res_;
+    IDirect3DSurface9*  pD3D9ResOrig_;
+    IDirect3DQuery9*    pQuery_;
+    D3D9ObjDesc_t       objDesc_;
+    D3D9ObjDesc_t       objDescOrig_;
+    HANDLE              handleOrig_;
+    HANDLE              handleShared_;
+    RECT                srcSurfRect;
+    RECT                SharedSurfRect;
+    cl_dx9_media_adapter_type_khr adapterType_;
+
+public:
+//! D3D9Object constructor initializes memeber variables
+    D3D9Object()
+        : releaseResources_(false),
+        pQuery_(NULL)
+    {
+        // @todo Incorrect initialization!!!
+        memset(this, 0, sizeof(D3D9Object));
+    }
+    //copy constructor
+    D3D9Object(D3D9Object& d3d9obj)
+        :pQuery_(NULL)
+    {
+        *this = d3d9obj;
+        this->releaseResources_ = true;
+    }
+
+    //virtual destructor
+    virtual ~D3D9Object()
+    {
+        ScopedLock sl(resLock_);
+        if(releaseResources_) {
+            if(pD3D9ResOrig_) pD3D9ResOrig_->Release();
+            if(pD3D9Res_) pD3D9Res_->Release();
+            if(pD3D9Aux_) pD3D9Aux_->Release();
+            if(pQuery_) pQuery_->Release();
+            //if the resouce is being used
+            if(resources_.size()) {
+                for(auto& it = resources_.cbegin(); it != resources_.cend(); it++) {
+                    if( surfInfo_.resource && 
+                        ((*it).first.surfInfo.resource == surfInfo_.resource) &&
+                        ((*it).first.surfPlane == surfPlane_)) {
+                            resources_.erase(it);
+                            break;
+                    }
+                }
+            }
+        }
+    }
+    static int initD3D9Object(const Context& amdContext, cl_dx9_media_adapter_type_khr adapter_type, 
+        cl_dx9_surface_info_khr* cl_surf_info, cl_uint plane, D3D9Object& obj);
+    cl_uint getMiscFlag(void);
+
+    D3D9Object* asD3D9Object() {return this;}
+    IDirect3DSurface9* getD3D9Resource() const {return pD3D9Res_;}
+    HANDLE getD3D9SharedHandle() const {return handleShared_;}
+    IDirect3DSurface9* getD3D9ResOrig() const {return pD3D9ResOrig_;}
+    RECT* getSrcSurfRect() {return &objDesc_.surfRect_;}
+    RECT* getSharedSurfRect() {return &objDescOrig_.surfRect_;}
+    void setD3D9AuxRes(IDirect3DSurface9* pAux) {pD3D9Aux_ = pAux;}
+    IDirect3DSurface9* getD3D9AuxRes() {return pD3D9Aux_;}
+    IDirect3DQuery9* getQuery() const {return pQuery_;}
+    Monitor & getResLock() { return resLock_;}
+    UINT getWidth() const {return objDesc_.objSize_.Width;}
+    UINT getHeight() const {return objDesc_.objSize_.Height;}
+    cl_uint getPlane() const {return surfPlane_;}
+    cl_dx9_media_adapter_type_khr getAdapterType() const { return adapterType_;};
+    const cl_dx9_surface_info_khr& getSurfInfo() const {return surfInfo_;};
+    size_t getElementBytes(D3DFORMAT d3d9Format, cl_uint plane);
+    size_t getElementBytes() {return getElementBytes(objDesc_.d3dFormat_, surfPlane_);}
+    D3DFORMAT getD3D9Format() {return objDesc_.d3dFormat_;}
+    D3D9ObjDesc_t* getObjDesc() {return &objDesc_;}
+    cl_image_format getCLFormatFromD3D9();
+    cl_image_format getCLFormatFromD3D9(D3DFORMAT d3d9Fmt, cl_uint plane);
+    // On acquire copy data from original resource to shared resource
+    virtual bool copyOrigToShared();
+    // On release copy data from shared copy to the original resource
+    virtual bool copySharedToOrig();
+};
+
+class Image2DD3D9 : public D3D9Object , public Image
+{
+protected:
+    //! Initializes the device memory array which is nested
+    // after'Image2DD3D9' object in memory layout.
+    virtual void initDeviceMemory();
+public:
+//! Image2DD3D9 constructor just calls constructors of base classes
+//! to pass down the parameters
+    Image2DD3D9(
+        Context&            amdContext,
+        cl_mem_flags        clFlags,
+        D3D9Object&         d3d9obj)
+        : // Call base classes constructors
+        D3D9Object(d3d9obj),
+        Image(
+            amdContext,
+            CL_MEM_OBJECT_IMAGE2D,
+            clFlags,
+            d3d9obj.getCLFormatFromD3D9(),
+            d3d9obj.getWidth(),
+            d3d9obj.getHeight(),
+            1,
+            d3d9obj.getWidth() * d3d9obj.getElementBytes(), //rowPitch),
+            0)
+        {
+            setInteropObj(this);
+        }
+    virtual ~Image2DD3D9() {}
+};
+
+cl_mem clCreateImage2DFromD3D9ResourceAMD(
+    Context&        amdContext,
+    cl_mem_flags    flags,
+    cl_dx9_media_adapter_type_khr adapter_type,
+    cl_dx9_surface_info_khr*  surface_info,
+    cl_uint         plane,
+    int*            errcode_ret);
+
+void SyncD3D9Objects(std::vector<amd::Memory*>& memObjects);
+
+} //namespace amd
+
+#endif  /* __OPENCL_CL_D3D9_AMD_H   */

rocclr/cmake/FindROCclr.cmake

@@ -0,0 +1,51 @@
+# Copyright (c) 2020-2021 Advanced Micro Devices, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+if(ROCCLR_FOUND)
+  return()
+endif()
+
+find_path(ROCCLR_INCLUDE_DIR top.hpp
+  HINTS
+    ${ROCCLR_PATH}
+  PATHS
+    # gerrit repo name
+    ${CMAKE_SOURCE_DIR}/vdi
+    ${CMAKE_SOURCE_DIR}/../vdi
+    ${CMAKE_SOURCE_DIR}/../../vdi
+    # github repo name
+    ${CMAKE_SOURCE_DIR}/ROCclr
+    ${CMAKE_SOURCE_DIR}/../ROCclr
+    ${CMAKE_SOURCE_DIR}/../../ROCclr
+    # jenkins repo name
+    ${CMAKE_SOURCE_DIR}/rocclr
+    ${CMAKE_SOURCE_DIR}/../rocclr
+    ${CMAKE_SOURCE_DIR}/../../rocclr
+  PATH_SUFFIXES
+    include)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ROCCLR
+  "\nROCclr not found"
+  ROCCLR_INCLUDE_DIR)
+mark_as_advanced(ROCCLR_INCLUDE_DIR)
+
+list(APPEND CMAKE_MODULE_PATH "${ROCCLR_INCLUDE_DIR}/../cmake")
+include(ROCclr)