diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index b2a5561dcf4dc..d2075d79543c1 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -5,6 +5,7 @@ , runCommandLocal , bison , flex +, intel-compute-runtime , llvmPackages_14 , opencl-clang , python3 @@ -19,8 +20,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.13.0"; - hash = "sha256-A9G1PH0WGdxU2u/ODrou53qF9kvrmE0tJSl9cFIOus0="; + rev = "v0.16.0"; + hash = "sha256-d197m80vSICdv4VKnyqdy3flzbKLKmB8jroY2difA7o="; }; inherit (llvmPackages_14) lld llvm; @@ -30,16 +31,16 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.14828.8"; + version = "1.0.16238.4"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-BGmZVBEw7XlgbQcWgRK+qbJS9U4Sm9G8g9m0GRUhmCI="; + hash = "sha256-XgQ2Gk3HDKBpsfomlpRUt8WybEIoHfKlyuWJCwCnmDA="; }; - nativeBuildInputs = [ bison cmake flex python3 ]; + nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; @@ -73,9 +74,14 @@ stdenv.mkDerivation rec { "-Wno-dev" ]; + passthru.tests = { + inherit intel-compute-runtime; + }; + meta = with lib; { - homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; + homepage = "https://github.com/intel/intel-graphics-compiler"; + changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${src.rev}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index f2ea91bf8be8b..ba4a86f901977 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -1,23 +1,35 @@ { lib -, stdenv -, fetchFromGitHub , addOpenGLRunpath , cmake +, fetchFromGitHub +, fmt_9 +, spdlog +, stdenv +, substituteAll }: stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.15.1"; + version = "1.16.14"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-jf1sKFfUmeNbLtmawKISmLQK2/95XvSg40se9IEKMT0="; + hash = "sha256-kMXxPfKL7HsQAkdyDGiuSITJ2WtOes8pJ92sWg7JkgM="; }; + patches = [ + (substituteAll { + src = ./system-spdlog.diff; + spdlog = lib.getDev spdlog; + }) + ]; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ fmt_9 ]; + postFixup = '' addOpenGLRunpath $out/lib/libze_loader.so ''; diff --git a/pkgs/development/libraries/level-zero/system-spdlog.diff b/pkgs/development/libraries/level-zero/system-spdlog.diff new file mode 100644 index 0000000000000..dee5432d0f7f9 --- /dev/null +++ b/pkgs/development/libraries/level-zero/system-spdlog.diff @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e4af80..a54eecb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,9 @@ + # Copyright (C) 2020-2024 Intel Corporation + # SPDX-License-Identifier: MIT + ++add_compile_definitions(SPDLOG_FMT_EXTERNAL) ++add_compile_definitions(FMT_HEADER_ONLY) ++ + cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR) + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +@@ -58,7 +60,7 @@ elseif(Git_FOUND) + endif() + + include(FetchContent) +-set(SPDLOG_ROOT "${FETCHCONTENT_BASE_DIR}/spdlog-src") ++set(SPDLOG_ROOT "@spdlog@") + + # Update other relevant variables to include the patch + set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") +diff --git a/source/utils/CMakeLists.txt b/source/utils/CMakeLists.txt +index cb6cfb1..599338a 100644 +--- a/source/utils/CMakeLists.txt ++++ b/source/utils/CMakeLists.txt +@@ -1,16 +1,6 @@ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: MIT + +-include(FetchContent) +-set(SPDLOG_REPO https://github.com/gabime/spdlog) +-set(SPDLOG_TAG v1.13.0) +-FetchContent_Declare( +- spdlog +- GIT_REPOSITORY ${SPDLOG_REPO} +- GIT_TAG ${SPDLOG_TAG} +-) +-FetchContent_makeAvailable(spdlog) +- + add_library(utils + STATIC + "logging.h" +@@ -19,5 +9,5 @@ add_library(utils + + target_include_directories(utils + PUBLIC +- ${FETCHCONTENT_BASE_DIR}/spdlog-src/include ++ @spdlog@/include + ) +diff --git a/source/utils/logging.h b/source/utils/logging.h +index 4aad451..c8c4cc3 100644 +--- a/source/utils/logging.h ++++ b/source/utils/logging.h +@@ -16,8 +16,8 @@ + #include + #include + +-#include "spdlog/sinks/basic_file_sink.h" +-#include "spdlog/spdlog.h" ++#include ++#include + + namespace loader { + diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index dacfb76eb9af8..d0263a48a82a3 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.30.26918.20"; + version = "24.13.29138.7"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-dEznHRgAcJa/BBTD/AWJHlA7fNj2IXHHrYcKM4M+/1o="; + hash = "sha256-AMIuA1AMrSX0xpdGSfye8iUJTk5s9HDiRy9Yy3kZss8="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -51,8 +51,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/intel/compute-runtime"; description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond"; + homepage = "https://github.com/intel/compute-runtime"; + changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}"; license = licenses.mit; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ SuperSandro2000 ];