From ca5123b595e499f1fd01240de22962645e2031d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 24 Jan 2024 17:01:23 +0100 Subject: [PATCH 1/4] spirv-llvm-translator: 14.0.0+unstable-2023-06-22 -> 14.0.0+unstable-2024-01-23 --- .../compilers/spirv-llvm-translator/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index fb5b5b0b7ba5..2d5a69b6bc6e 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -28,10 +28,10 @@ let version = "15.0.0"; rev = "v${version}"; hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI="; - } else if llvmMajor == "14" then rec{ - version = "14.0.0+unstable-2023-06-22"; - rev = "23f398bf369093b1fd67459db8071ffcc6b92658"; - hash = "sha256-o7cVj5/ZMER2CvfxL4pRb2qCIxC/HFUPiitf2fKtCyk="; + } else if llvmMajor == "14" then { + version = "14.0.0+unstable-2024-01-23"; + rev = "582a3024c0c2d624a40fa2731d74b2c9ca3b94ab"; + hash = "sha256-1IRX+5Xh8Fj+/1DIZQrN8ijb2y7H39Y3u+IdbqjQgCc="; } else if llvmMajor == "11" then { version = "11.0.0+unstable-2022-05-04"; rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0 From a1056332702e4311baafe6c945caa00fc3094699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 24 Jan 2024 17:01:58 +0100 Subject: [PATCH 2/4] intel-graphics-compiler: 1.0.15136.4 -> 1.0.15610.11 --- .../compilers/intel-graphics-compiler/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index db03d2d85ca2..72be8998013c 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -19,8 +19,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.13.0"; - hash = "sha256-A9G1PH0WGdxU2u/ODrou53qF9kvrmE0tJSl9cFIOus0="; + rev = "v0.14.0"; + hash = "sha256-t7m2y+DiZf0xum1vneXvoCyH767SKMOq4YzMIuZngR8="; }; inherit (llvmPackages_14) lld llvm; @@ -30,13 +30,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.15136.4"; + version = "1.0.15610.11"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-Qh3FNck1z+rr7eSqxVnNs7YKvgXpKGY5dd3yx1Ft9Mg="; + hash = "sha256-Fu1g5M2lpcnLw6aSHI5gx47VOfx+rIdIhBlwe/Dv8bk="; }; nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; From 160bd6c83f9d2671224473405087326a7428632f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 24 Jan 2024 17:02:11 +0100 Subject: [PATCH 3/4] intel-graphics-compiler: add intel-compute-runtime to passthru.tests --- .../compilers/intel-graphics-compiler/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 72be8998013c..54a8e82e27ee 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 @@ -73,6 +74,10 @@ 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"; From 9310134d22dbfe4bbe6f90a9a9dd6d269730d830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Jan 2024 21:04:51 +0100 Subject: [PATCH 4/4] spirv-llvm-translator: apply patch from #282006 only to llvm version 15+ --- pkgs/development/compilers/spirv-llvm-translator/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 2d5a69b6bc6e..88119d002808 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -48,7 +48,7 @@ disable-warnings-if-gcc13 (stdenv.mkDerivation { inherit (branch) rev hash; }; - patches = [ + patches = lib.optionals (lib.versionAtLeast llvmMajor "15") [ # Fixes build after spirv-headers breaking change (fetchpatch { url = "https://github.com/KhronosGroup/SPIRV-LLVM-Translator/commit/0166a0fb86dc6c0e8903436bbc3a89bc3273ebc0.patch";