Unverified Commit fd12f481 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

intel-graphics-compiler: 2.18.5 -> 2.20.3; intel-compute-runtime:...

intel-graphics-compiler: 2.18.5 -> 2.20.3; intel-compute-runtime: 25.35.35096.9 -> 25.40.35563.4 (#456765)
parents b6231aa7 6bce3209
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@

stdenv.mkDerivation rec {
  pname = "intel-compute-runtime";
  version = "25.35.35096.9";
  version = "25.40.35563.4";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "compute-runtime";
    tag = version;
    hash = "sha256-GAFbpf5ZUpq+jpVECa5buauCYdpPBOBrREkgrGyhxPA=";
    hash = "sha256-V2zmS3CFLxhyFYvGOdkix9g3E6JkeVa/pDLPC5NYivo=";
  };

  nativeBuildInputs = [
+0 −14
Original line number Diff line number Diff line
@@ -8,25 +8,11 @@ are no uses of COMPILE_DEFINITIONS_<CONFIG>.

Signed-off-by: Chris Mayo <aklhfex@gmail.com>
---
 IGC/MDAutogen/CMakeLists.txt                    | 2 +-
 external/SPIRV-Tools/CMakeLists.txt             | 2 +-
 visa/CMakeLists.txt                             | 7 +------
 visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 6 +-----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt
index c9522feea29d..0a79b3c8e32b 100644
--- a/igc/IGC/MDAutogen/CMakeLists.txt
+++ b/igc/IGC/MDAutogen/CMakeLists.txt
@@ -6,7 +6,7 @@
 #
 #============================ end_copyright_notice =============================
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 set(_autogenScript "${IGC_SOURCE_DIR}/common/autogen.py")
 set(_autogenSource "${IGC_SOURCE_DIR}/common/MDFrameWork.h")
diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
index d2e3f63fb0d3..75f013409990 100644
--- a/igc/external/SPIRV-Tools/CMakeLists.txt
+17 −11
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  cmake,
  ninja,
  git,
@@ -15,9 +14,12 @@
  spirv-headers,
}:

let
  llvmVersion = "16.0.6";
in
stdenv.mkDerivation rec {
  pname = "intel-graphics-compiler";
  version = "2.18.5";
  version = "2.20.3";

  # See the repository for expected versions:
  # <https://github.com/intel/intel-graphics-compiler/blob/v2.16.0/documentation/build_ubuntu.md#revision-table>
@@ -27,35 +29,35 @@ stdenv.mkDerivation rec {
      owner = "intel";
      repo = "intel-graphics-compiler";
      tag = "v${version}";
      hash = "sha256-AvEeK3rySEu89br4JgeZlXVQ6IXEzStVZYvehzdWq7g=";
      hash = "sha256-OCou4yhx9rY1JznrzGMLhsjj/3CvqQXfXWFAPDxA8Ds=";
    })
    (fetchFromGitHub {
      name = "llvm-project";
      owner = "llvm";
      repo = "llvm-project";
      tag = "llvmorg-15.0.7";
      hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
      tag = "llvmorg-${llvmVersion}";
      hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
    })
    (fetchFromGitHub {
      name = "vc-intrinsics";
      owner = "intel";
      repo = "vc-intrinsics";
      tag = "v0.23.1";
      hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc=";
      tag = "v0.23.4";
      hash = "sha256-zorhOhBTcymnAlShJxJecXD+HIfScGouhSea/A3tBXE=";
    })
    (fetchFromGitHub {
      name = "opencl-clang";
      owner = "intel";
      repo = "opencl-clang";
      tag = "v15.0.3";
      hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw==";
      tag = "v16.0.5";
      hash = "sha256-JfynEsCXltVdVY/LqWvZwzWfzEFUz6nI9Zub+bze1zE=";
    })
    (fetchFromGitHub {
      name = "llvm-spirv";
      owner = "KhronosGroup";
      repo = "SPIRV-LLVM-Translator";
      tag = "v15.0.15";
      hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
      tag = "v16.0.17";
      hash = "sha256-ta5QbVady9/cwBbAwF1r4ft/ESMnLgcmGMrFhv1PCH0=";
    })
  ];

@@ -90,6 +92,10 @@ stdenv.mkDerivation rec {
    substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \
      --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \
                     'COMMAND patch -p1 --ignore-whitespace -i '

    # match default LLVM version with our provided version to apply correct patches
    substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \
      --replace-fail "15.0.7" "${llvmVersion}"
  '';

  nativeBuildInputs = [
+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@

stdenv.mkDerivation rec {
  pname = "level-zero";
  version = "1.24.3";
  version = "1.25.2";

  src = fetchFromGitHub {
    owner = "oneapi-src";
    repo = "level-zero";
    tag = "v${version}";
    hash = "sha256-1UwcH+7q2elpqlqafpytC+K0jTHYdyjRtUX9hpBq+EQ=";
    hash = "sha256-qB88S5k+HLBSOxNo6JBSGihJnY1jUdIpJTdLwgAP6bA=";
  };

  nativeBuildInputs = [