[clang][offload] - Update offload runtime and driver for lib/llvm move

Change-Id: I0477710855e66e82be35fac197b59ee7c6550d89

Author: estewart08

clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp

@@ -550,7 +550,7 @@ void AMDGPUOpenMPToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
   CC1Args.push_back("-internal-isystem");
   CC1Args.push_back(DriverArgs.MakeArgString(D.Dir + "/../include"));
   CC1Args.push_back("-internal-isystem");
-  CC1Args.push_back(DriverArgs.MakeArgString(D.Dir + "/../../include"));
+  CC1Args.push_back(DriverArgs.MakeArgString(D.Dir + "/../../../include"));
 
   HostTC.AddClangSystemIncludeArgs(DriverArgs, CC1Args);
 

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -1238,8 +1238,15 @@ void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
       CmdArgs.push_back("-rpath");
       CmdArgs.push_back(Args.MakeArgString(TC.getCompilerRTPath()));
     }
+
     CmdArgs.push_back("-rpath");
     CmdArgs.push_back(Args.MakeArgString(CandidateRPath.c_str()));
+    std::string rocmPath = Args.getLastArgValue(clang::driver::options::OPT_rocm_path_EQ).str();
+    if (rocmPath.size() != 0){
+      rocmPath = rocmPath + "/lib";
+      CmdArgs.push_back("-rpath");
+      CmdArgs.push_back(Args.MakeArgString(rocmPath.c_str()));
+    }
     if (llvm::find_if(CmdArgs, [](StringRef str) {
           return !str.compare("--enable-new-dtags");
         }) == CmdArgs.end())

llvm/runtimes/CMakeLists.txt

@@ -502,19 +502,25 @@ if(build_runtimes)
     list(APPEND extra_cmake_args "-DCMAKE_PROGRAM_PATH=${CMAKE_PROGRAM_PATH}")
   endif()
 
-  if("openmp" IN_LIST LLVM_ENABLE_RUNTIMES)
-    if(DEFINED LIBOMPTARGET_EXTERNAL_PROJECT_HSA_PATH AND DEFINED LIBOMPTARGET_EXTERNAL_PROJECT_THUNK_PATH)
+  if("offload" IN_LIST LLVM_ENABLE_RUNTIMES)
+    if(DEFINED LIBOMPTARGET_EXTERNAL_PROJECT_HSA_PATH AND
+       DEFINED LIBOMPTARGET_EXTERNAL_PROJECT_THUNK_PATH AND
+       DEFINED LIBOMPTARGET_EXTERNAL_PROJECT_ROCM_DEVICE_LIBS_PATH)
       ExternalProject_Add(roct
         SOURCE_DIR ${LIBOMPTARGET_EXTERNAL_PROJECT_THUNK_PATH}
         DEPENDS clang llvm-link lld opt llvm-objcopy
         INSTALL_COMMAND ""
-	CMAKE_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/lib/cmake)
+        CMAKE_ARGS -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/lib/cmake)
       ExternalProject_Add(rocr-runtime
         SOURCE_DIR ${LIBOMPTARGET_EXTERNAL_PROJECT_HSA_PATH}
         DEPENDS clang llvm-link lld opt llvm-objcopy roct
         INSTALL_COMMAND ""
-	CMAKE_ARGS -DBUILD_SHARED_LIBS=ON -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/lib/cmake -DIMAGE_SUPPORT=OFF -DLLVM_RUNTIME_OPENMP=ON -DHSAKMT_SRC_PATH=${LIBOMPTARGET_EXTERNAL_PROJECT_THUNK_PATH})
+        CMAKE_ARGS -DBUILD_SHARED_LIBS=ON -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/lib/cmake -DIMAGE_SUPPORT=OFF -DLLVM_RUNTIME_OPENMP=ON -DHSAKMT_SRC_PATH=${LIBOMPTARGET_EXTERNAL_PROJECT_THUNK_PATH})
         set(HSA_DEP rocr-runtime)
+      ExternalProject_Add(rocm-device-libs
+        SOURCE_DIR ${LIBOMPTARGET_EXTERNAL_PROJECT_ROCM_DEVICE_LIBS_PATH}
+        DEPENDS clang llvm-link lld opt llvm-objcopy
+        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${ROCM_DEVICE_LIBS_INSTALL_PREFIX_PATH} -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/lib/cmake -DROCM_DEVICE_LIBS_BITCODE_INSTALL_LOC_NEW=${ROCM_DEVICE_LIBS_BITCODE_INSTALL_LOC} -DROCM_DEVICE_LIBS_BITCODE_INSTALL_LOC_OLD=amdgcn)
     endif()
     if("AMDGPU" IN_LIST LLVM_TARGETS_TO_BUILD)
       set(AMDGPU_ARCH_DEP amdgpu-arch)

offload/CMakeLists.txt

@@ -4,6 +4,14 @@
 cmake_minimum_required(VERSION 3.20.0)
 set(LLVM_SUBPROJECT_TITLE "liboffload")
 
+if(DEFINED LIBOMP_SHARED_LINKER_FLAGS)
+  set(CMAKE_SHARED_LINKER_FLAGS "${LIBOMP_SHARED_LINKER_FLAGS}")
+endif()
+
+if(DEFINED LIBOMP_INSTALL_RPATH)
+  set(CMAKE_INSTALL_RPATH "${LIBOMP_INSTALL_RPATH}")
+endif()
+
 if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
   set(OPENMP_STANDALONE_BUILD TRUE)
   project(offload C CXX ASM)

offload/hostexec/CMakeLists.txt

@@ -33,6 +33,7 @@ if(DEFINED HSA_RUNTIME)
 elseif(${hsa-runtime64_FOUND})
   message(STATUS "Building hostexec for AMDGCN linked against libhsa")
   set(HSA_INCLUDE ${hsa-runtime64_DIR}/../../../include/hsa)
+  get_target_property(HSA_INCLUDE hsa-runtime64::hsa-runtime64 INTERFACE_INCLUDE_DIRECTORIES)
   set(HOSTEXEC_EXTRA_SOURCE)
   set(HOSTEXEC_DEP_LIBRARIES hsa-runtime64::hsa-runtime64)
 else()
@@ -163,7 +164,8 @@ foreach(archname ${HOSTRPC_ARCHS})
    foreach(mcpu ${mcpus})
       if (${archname} STREQUAL "amdgcn")
         find_package(AMDDeviceLibs REQUIRED CONFIG
-		     HINTS ${CMAKE_BINARY_DIR}/../../tools/rocm-device-libs
+                     HINTS ${CMAKE_BINARY_DIR}/../../tools/rocm-device-libs
+                           ${CMAKE_BINARY_DIR}/../rocm-device-libs-prefix/src/rocm-device-libs-build
                            ${CMAKE_INSTALL_PREFIX}
                      PATHS /opt/rocm
         )