From e2642a5ab210ef69de42eaf4263cb3a54c1b0c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Aug 2024 23:35:23 +0200 Subject: [PATCH 1/3] intel-graphics-compiler: 1.0.17193.4 -> 1.0.17384.11 Changelog: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.17384.11 --- .../intel-graphics-compiler/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 27cd6acc3f17..ef3ff5ff4565 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, bash , cmake , runCommandLocal , bison @@ -20,8 +21,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.18.0"; - hash = "sha256-F2GR3TDUUiygEhdQN+PsMT/CIYBATMQX5wkvwrziS2E="; + rev = "v0.19.0"; + hash = "sha256-vOK7xfOR+aDpdGd8oOFLJc1Ct1S5BCJmLN6Ubn5wlkQ="; }; inherit (llvmPackages_14) lld llvm; @@ -31,16 +32,25 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.17193.4"; + version = "1.0.17384.11"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-OOKj3kfl+0/dgeICFtbiOVE0nsYYvI4v97BLjcExAmc="; + hash = "sha256-O4uMaPauRv2aMgM2B7XdzCcjI5JghsjX5XbkeloLyck="; }; - nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; + postPatch = '' + substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" + + chmod +x IGC/Scripts/igc_create_linker_script.sh + patchShebangs --build IGC/Scripts/igc_create_linker_script.sh + ''; + + nativeBuildInputs = [ bash bison cmake flex (python3.withPackages (ps : with ps; [ mako pyyaml ])) ]; buildInputs = [ lld llvm spirv-headers spirv-llvm-translator' spirv-tools ]; @@ -49,12 +59,6 @@ stdenv.mkDerivation rec { # testing is done via intel-compute-runtime doCheck = false; - postPatch = '' - substituteInPlace IGC/AdaptorOCL/igc-opencl.pc.in \ - --replace '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ - --replace '/@CMAKE_INSTALL_LIBDIR@' "/lib" - ''; - # Handholding the braindead build script # cmake requires an absolute path prebuilds = runCommandLocal "igc-cclang-prebuilds" { } '' From 785c387295281222d60691155307471fcbfe2de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Aug 2024 23:49:32 +0200 Subject: [PATCH 2/3] spirv-llvm-translator: 14.0.0+unstable-2024-05-27 -> 14.0.0+unstable-2024-07-15 --- .../development/compilers/spirv-llvm-translator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 6321b6940ec7..20adaf5f559b 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -32,9 +32,9 @@ let rev = "v${version}"; hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; } else if llvmMajor == "14" then { - version = "14.0.0+unstable-2024-05-27"; - rev = "62f5b09b11b1da42274371b1f7535f6f2ab11485"; - hash = "sha256-lEOdWHyq9hEyBZPz9z1LxUAZqNub+mZFHHWMlzh3HaI="; + version = "14.0.0+unstable-2024-07-15"; + rev = "2823e7052b7999c10fff63bc8089e5aa205716f4"; + hash = "sha256-8/4B74hYge6WiH7PzRGEgE3W7f9IkQ4VMmfkWKYA/l4="; } else if llvmMajor == "11" then { version = "11.0.0+unstable-2022-05-04"; rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 From e08a7e743fdc61120647196c9faf6bdcfacfaab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Aug 2024 23:50:27 +0200 Subject: [PATCH 3/3] opencl-clang: unstable-2024-06-06 -> 14.0.0-unstable-2024-07-09 --- pkgs/development/libraries/opencl-clang/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index b906be979f57..341c3f3ecf57 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -53,14 +53,14 @@ let }; }; - version = "unstable-2024-06-06"; + version = "14.0.0-unstable-2024-07-09"; src = applyPatches { src = fetchFromGitHub { owner = "intel"; repo = "opencl-clang"; # https://github.com/intel/opencl-clang/compare/ocl-open-140 - rev = "66a54cbef6726c4e791986779a60d7a45b09c9c9"; - hash = "sha256-vM2IlF/e3b2GIXMaHYre+iQn4WKsFIU3x90Ee5KVHtI="; + rev = "470cf0018e1ef6fc92eda1356f5f31f7da452abc"; + hash = "sha256-Ja+vJ317HI3Nh45kcAMhyLVTIqyy6pE5KAsKs4ou9J8="; }; patches = [