From d57df9d4baee0e72edeeb5ffd5c25c80bd9227bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Mar 2025 03:12:32 +0100 Subject: [PATCH 1/3] spirv-llvm-translator: 14.0.0+unstable-2024-07-15 -> 14.0.0+unstable-2025-01-28 --- pkgs/by-name/sp/spirv-llvm-translator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spirv-llvm-translator/package.nix b/pkgs/by-name/sp/spirv-llvm-translator/package.nix index 47b9544ee475..ab8f2b250df9 100644 --- a/pkgs/by-name/sp/spirv-llvm-translator/package.nix +++ b/pkgs/by-name/sp/spirv-llvm-translator/package.nix @@ -49,9 +49,9 @@ let } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-07-15"; - rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; - hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; + version = "14.0.0+unstable-2025-01-28"; + rev = "9df26b6af308cb834a4013deb8094f386f29accd"; + hash = "sha256-8VRQwXFbLcYgHtWKs73yuTsy2kkCgYgPqD+W/GPy1BM="; } else if llvmMajor == "11" then { From d355071566ce1ff564f1fa3db919136ca2f5782f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Mar 2025 03:12:10 +0100 Subject: [PATCH 2/3] intel-graphics-compiler: 1.0.17384.11 ->2.8.3, minor cleanup --- .../in/intel-graphics-compiler/package.nix | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 851e5bac3bb5..b8e63635ac24 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -22,24 +22,33 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.19.0"; - hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; + rev = "v0.22.1"; + hash = "sha256-dSK+kNEZoF4bBx24S0No9aZLZiHK0U9TR1jRyEBL+2U="; }; inherit (llvmPackages_14) lld llvm; inherit (if buildWithPatches then opencl-clang else llvmPackages_14) clang libclang; spirv-llvm-translator' = spirv-llvm-translator.override { inherit llvm; }; -in + # Handholding the braindead build script + # cmake requires an absolute path + prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' + mkdir $out + ln -s ${clang}/bin/clang $out/ + ln -s ${opencl-clang}/lib/* $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ + ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ + ''; +in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.17384.11"; + version = "2.8.3"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; - rev = "igc-${version}"; - hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; + tag = "v${version}"; + hash = "sha256-1YzvzVmMW5s4keQfa7r6xfyVg7RWSdKNgBtdTN6SADg="; }; postPatch = '' @@ -77,16 +86,6 @@ stdenv.mkDerivation rec { # testing is done via intel-compute-runtime doCheck = false; - # Handholding the braindead build script - # cmake requires an absolute path - prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' - mkdir $out - ln -s ${clang}/bin/clang $out/ - ln -s ${opencl-clang}/lib/* $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c.h $out/ - ln -s ${lib.getLib libclang}/lib/clang/${lib.getVersion clang}/include/opencl-c-base.h $out/ - ''; - cmakeFlags = [ "-DVC_INTRINSICS_SRC=${vc_intrinsics_src}" "-DCCLANG_BUILD_PREBUILDS=ON" From 7615b18b2fdad13a35603258dcb9f6dc44661d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 21 Mar 2025 03:10:06 +0100 Subject: [PATCH 3/3] intel-compute-runtime: 24.52.32224.5 -> 25.09.32961.5, minor cleanup --- .../by-name/in/intel-compute-runtime/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index bcccc4f6d899..ea453d6058f6 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.52.32224.5"; + version = "25.09.32961.5"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; - rev = version; - hash = "sha256-Unoh33bZFsMCqJ2hWEYVEdMF2V/aSIDynThz1pUyM7Q="; + tag = version; + hash = "sha256-oOafnYq4p0MubgsjV2kdW/pd7s0N5xmUnWVLg2JAIS8="; }; nativeBuildInputs = [ @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DSKIP_UNIT_TESTS=1" - "-DIGC_DIR=${intel-graphics-compiler}" - "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" + (lib.cmakeBool "SKIP_UNIT_TESTS" true) + (lib.cmakeFeature "IGC_DIR" (builtins.toString intel-graphics-compiler)) + (lib.cmakeFeature "OCL_ICD_VENDORDIR" "${placeholder "out"}/etc/OpenCL/vendors") # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; outputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer"; + description = "Intel Graphics Compute Runtime oneAPI Level Zero and OpenCL, supporting 12th Gen and newer"; mainProgram = "ocloc"; homepage = "https://github.com/intel/compute-runtime"; changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}";