Move Unified Runtime code into intel/llvm

libdevice/CMakeLists.txt

@@ -8,7 +8,13 @@ set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
   )
 
-if(EXISTS ${FETCHCONTENT_BASE_DIR}/unified-runtime-src)
+set(UR_INTREE_SOURCE_DIR "${LLVM_SOURCE_DIR}/../unified-runtime")
+cmake_path(NORMAL_PATH UR_INTREE_SOURCE_DIR OUTPUT_VARIABLE UR_INTREE_SOURCE_DIR)
+
+if(IS_DIRECTORY "${UR_INTREE_SOURCE_DIR}")
+  set(UR_SANITIZER_INCLUDE_DIR
+      ${UR_INTREE_SOURCE_DIR}/source/loader/layers/sanitizer)
+elseif(EXISTS ${FETCHCONTENT_BASE_DIR}/unified-runtime-src)
   set(UR_SANITIZER_INCLUDE_DIR
       ${FETCHCONTENT_BASE_DIR}/unified-runtime-src/source/loader/layers/sanitizer)
 elseif(EXISTS ${SYCL_UR_SOURCE_DIR})

sycl/cmake/modules/FetchUnifiedRuntime.cmake

@@ -75,7 +75,19 @@ cmake_path(NORMAL_PATH UR_INTREE_SOURCE_DIR OUTPUT_VARIABLE UR_INTREE_SOURCE_DIR
 
 if(IS_DIRECTORY "${UR_INTREE_SOURCE_DIR}")
   set(UR_INTREE_BINARY_DIR ${LLVM_BINARY_DIR}/unified-runtime)
-  add_subdirectory(${UR_INTREE_SOURCE_DIR} ${UR_INTREE_BINARY_DIR})
+  set(UNIFIED_RUNTIME_SOURCE_DIR
+    "${UR_INTREE_SOURCE_DIR}" CACHE PATH
+    "Path to Unified Runtime Headers" FORCE)
+  set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
+  # Due to the use of dependentloadflag and no installer for UMF and hwloc we need
+  # to link statically on windows
+  if(WIN32)
+    set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
+    set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
+  else()
+    set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF")
+  endif()
+  add_subdirectory(${UNIFIED_RUNTIME_SOURCE_DIR} ${UR_INTREE_BINARY_DIR})
 elseif(SYCL_UR_USE_FETCH_CONTENT)
   include(FetchContent)
 

unified-runtime/.clang-format

@@ -0,0 +1,4 @@
+---
+Language:      Cpp
+BasedOnStyle:  LLVM
+...

unified-runtime/.editorconfig

@@ -0,0 +1,15 @@
+[*]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_size = 4
+
+[scripts/core/*]
+indent_size = 4
+
+[CMakeLists.txt]
+indent_size = 4
+
+[*.cmake]
+indent_size = 4

unified-runtime/.gitattributes

@@ -0,0 +1 @@
+* text=auto

unified-runtime/.github/scripts/get_system_info.sh

@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+#  Copyright (C) 2023 Intel Corporation
+#  Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+#  See LICENSE.TXT
+#  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# get_system_info.sh - Script for printing system info
+
+function check_L0_version {
+    if command -v dpkg &> /dev/null; then
+        dpkg -l | grep level-zero && return
+    fi
+
+    if command -v rpm &> /dev/null; then
+        rpm -qa | grep level-zero && return
+    fi
+
+    if command -v zypper &> /dev/null; then
+        zypper se level-zero && return
+    fi
+
+    echo "level-zero not installed"
+}
+
+function system_info {
+	echo "**********system_info**********"
+	cat /etc/os-release | grep -oP "PRETTY_NAME=\K.*"
+	cat /proc/version
+	echo "**********SYCL-LS**********"
+	source /opt/intel/oneapi/setvars.sh
+	sycl-ls
+	echo "**********VGA**********"
+	lspci | grep VGA
+	echo "**********CUDA Version**********"
+	if command -v nvidia-smi &> /dev/null; then
+		nvidia-smi
+	else
+		echo "CUDA not installed"
+	fi
+	echo "**********L0 Version**********"
+	check_L0_version
+	echo "**********ROCm Version**********"
+	if command -v rocminfo &> /dev/null; then
+		rocminfo
+	else
+		echo "ROCm not installed"
+	fi
+	echo "**********/proc/cmdline**********"
+	cat /proc/cmdline
+	echo "**********CPU info**********"
+	lscpu
+	echo "**********/proc/meminfo**********"
+	cat /proc/meminfo
+	echo "**********build/bin/urinfo**********"
+	$(dirname "$(readlink -f "$0")")/../../build/bin/urinfo --no-linear-ids --verbose || true
+	echo "******OpenCL*******"
+	# The driver version of OpenCL Graphics is the compute-runtime version
+	clinfo || echo "OpenCL not installed"
+	echo "**********list-environment**********"
+	echo "PATH=$PATH"
+	echo
+	echo "CPATH=$CPATH"
+	echo
+	echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+	echo
+	echo "LIBRARY_PATH=$LIBRARY_PATH"
+	echo
+	echo "PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
+	echo
+	echo "******list-build-system-versions*******"
+	gcc --version 2>/dev/null || true
+	echo
+	clang --version 2>/dev/null || true
+	echo
+	make --version 2>/dev/null || true
+	echo "**********/proc/modules**********"
+	cat /proc/modules
+	echo "***************installed-packages***************"
+	# Instructions below will return some minor errors, as they are dependent on the Linux distribution.
+	zypper se --installed-only 2>/dev/null || true
+	apt list --installed 2>/dev/null || true
+	yum list installed 2>/dev/null || true
+}
+
+# Call the function above to print system info.
+system_info

unified-runtime/.gitignore

@@ -0,0 +1,92 @@
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+*.exp
+*.pdb
+*.log
+*.tlog
+*.ilk
+*.idb
+*.CopyComplete
+*.pyc
+*.tmp
+
+# Precompiled Headers
+*.gch
+*.pch
+*.ipch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Project files
+*.sln
+*.vcproj
+*.vcxproj
+*.pyproj
+*.suo
+*.db
+*.opendb
+*.user
+*.filters
+.vs/
+.idea/
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Debug files
+scripts/**/*.json
+
+# Python cache
+__pycache__/
+*.py[cod]
+
+# Generated docs
+docs/
+
+# Build files
+/build*/
+out/
+
+# irepo files
+.irepo
+
+# ci deps
+.deps
+
+# third_party files
+/third_party/*/
+
+
+# VS CMake settings
+/CMakeSettings.json
+
+# Temporary files
+*.~vsdx
+
+# IDE Files
+/.vscode
+/.devcontainer
+
+# External content
+*/**/external
+
+# VS clangd
+/.cache
+/compile_commands.json

unified-runtime/.trivyignore

@@ -0,0 +1,6 @@
+# Docs: https://aquasecurity.github.io/trivy/latest/docs/configuration/filtering/#trivyignore
+
+# In docker files:
+# HEALTHCHECK is not required for development, nor in CI (failed docker = failed CI).
+# We're not hosting any application with usage of the dockers.
+AVD-DS-0026

unified-runtime/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Unified Runtime changelog
+
+## v.X.X.X
+* Placeholder for first release