Unverified Commit d0be5a2d authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #283531 from SuperSandro2000/intel-graphics-compiler-2 

intel-graphics-compiler: 1.0.15136.4 -> 1.0.15610.11 and some of it's direct dependencies
parents 9b8de0ae 9310134d

pkgs/development/compilers/intel-graphics-compiler/default.nix

+9 −4
Original line number Diff line number Diff line
@@ -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.14.0";

    hash = "sha256-t7m2y+DiZf0xum1vneXvoCyH767SKMOq4YzMIuZngR8=";

  };



  inherit (llvmPackages_14) lld llvm;
@@ -30,13 +31,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 ])) ];
@@ -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";

pkgs/development/compilers/spirv-llvm-translator/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -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
@@ -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";