commit eb20eae90fe9bb13ac2ee9bd6b7e4fd636892de1 · pyrox.dev/nixpkgs

+7 -6

pkgs/development/compilers/hip/default.nix

···

       31
       31
        
       let

     

       32
       32
        
         hip = stdenv.mkDerivation rec {

     

       33
       33
        
           pname = "hip";

     

       34
       34
       -
           version = "4.5.2";

     

       34
       34
       +
           version = "5.0.2";

     

       35
       35
        
       

     

       36
       36
        
           src = fetchFromGitHub {

     

       37
       37
        
             owner = "ROCm-Developer-Tools";

     

       38
       38
        
             repo = "HIP";

     

       39
       39
        
             rev = "rocm-${version}";

     

       40
       40
       -
             sha256 = "sha256-AuA5ubRPywXaBBrjdHg5AT8rrVKULKog6Lh8jPaUcXY=";

     

       40
       40
       +
             hash = "sha256-w023vBLJaiFbRdvz9UfZLPasRjk3VqM9zwctCIJ5hGU=";

     

       41
       41
        
           };

     

       42
       42
        
       

     

       43
       43
        
           # - fix bash paths

     
···

       68
       68
        
                 -e 's,`file,`${file}/bin/file,g' \

     

       69
       69
        
                 -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \

     

       70
       70
        
                 -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \

     

       71
       71
       -
                 -i bin/hipcc

     

       71
       71
       +
                 -i bin/hipcc.pl

     

       72
       72
        
       

     

       73
       73
        
             sed -e 's,^\($HSA_PATH=\).*$,\1"${rocm-runtime}";,' \

     

       74
       74
        
                 -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \

     

       75
       75
        
                 -e 's,^\($HIP_PLATFORM=\).*$,\1"amd";,' \

     

       76
       76
        
                 -e 's,$HIP_CLANG_PATH/llc,${llvm}/bin/llc,' \

     

       77
       77
        
                 -e 's, abs_path, Cwd::abs_path,' \

     

       78
       78
       -
                 -i bin/hipconfig

     

       78
       78
       +
                 -i bin/hipconfig.pl

     

       79
       79
        
       

     

       80
       80
        
             sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm

     

       81
       81
        
           '';

     
···

       102
       102
        
       in

     

       103
       103
        
       stdenv.mkDerivation rec {

     

       104
       104
        
         pname = "hip";

     

       105
       105
       -
         version = "4.5.2";

     

       105
       105
       +
         version = "5.0.2";

     

       106
       106
        
       

     

       107
       107
        
         src = fetchFromGitHub {

     

       108
       108
        
           owner = "ROCm-Developer-Tools";

     

       109
       109
        
           repo = "hipamd";

     

       110
       110
        
           rev = "rocm-${version}";

     

       111
       111
       -
           sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE=";

     

       111
       111
       +
           hash = "sha256-hhTwKG0wDpbIBI8S61AhdNldX+STO8C66xi2EzmJSBs=";

     

       112
       112
        
         };

     

       113
       113
        
       

     

       114
       114
        
         nativeBuildInputs = [ cmake python3 makeWrapper perl ];

     
···

       135
       135
        
           "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}"

     

       136
       136
        
           "-DHIP_COMMON_DIR=${hip}"

     

       137
       137
        
           "-DROCCLR_PATH=${rocclr}"

     

       138
       138
       +
           "-DHIP_VERSION_BUILD_ID=0"

     

       138
       139
        
         ];

     

       139
       140
        
       

     

       140
       141
        
         postInstall = ''

-78

pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch

···

       1
       1
       -
       --- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

     

       2
       2
       -
       +++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

     

       3
       3
       -
       @@ -370,15 +370,6 @@

     

       4
       4
       -
        

     

       5
       5
       -
        #if SANITIZER_GLIBC

     

       6
       6
       -
          // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE

     

       7
       7
       -
       -  _(CYGETDEFTHRESH, WRITE, sizeof(int));

     

       8
       8
       -
       -  _(CYGETDEFTIMEOUT, WRITE, sizeof(int));

     

       9
       9
       -
       -  _(CYGETMON, WRITE, struct_cyclades_monitor_sz);

     

       10
       10
       -
       -  _(CYGETTHRESH, WRITE, sizeof(int));

     

       11
       11
       -
       -  _(CYGETTIMEOUT, WRITE, sizeof(int));

     

       12
       12
       -
       -  _(CYSETDEFTHRESH, NONE, 0);

     

       13
       13
       -
       -  _(CYSETDEFTIMEOUT, NONE, 0);

     

       14
       14
       -
       -  _(CYSETTHRESH, NONE, 0);

     

       15
       15
       -
       -  _(CYSETTIMEOUT, NONE, 0);

     

       16
       16
       -
          _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);

     

       17
       17
       -
          _(EQL_ENSLAVE, WRITE, struct_ifreq_sz);

     

       18
       18
       -
          _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);

     

       19
       19
       -
       --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

     

       20
       20
       -
       +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

     

       21
       21
       -
       @@ -143,7 +143,6 @@

     

       22
       22
       -
        # include <sys/procfs.h>

     

       23
       23
       -
        #endif

     

       24
       24
       -
        #include <sys/user.h>

     

       25
       25
       -
       -#include <linux/cyclades.h>

     

       26
       26
       -
        #include <linux/if_eql.h>

     

       27
       27
       -
        #include <linux/if_plip.h>

     

       28
       28
       -
        #include <linux/lp.h>

     

       29
       29
       -
       @@ -460,7 +459,6 @@

     

       30
       30
       -
        

     

       31
       31
       -
        #if SANITIZER_GLIBC

     

       32
       32
       -
          unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);

     

       33
       33
       -
       -  unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);

     

       34
       34
       -
        #if EV_VERSION > (0x010000)

     

       35
       35
       -
          unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);

     

       36
       36
       -
        #else

     

       37
       37
       -
       @@ -824,15 +822,6 @@

     

       38
       38
       -
        #endif // SANITIZER_LINUX

     

       39
       39
       -
        

     

       40
       40
       -
        #if SANITIZER_LINUX && !SANITIZER_ANDROID

     

       41
       41
       -
       -  unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;

     

       42
       42
       -
       -  unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;

     

       43
       43
       -
       -  unsigned IOCTL_CYGETMON = CYGETMON;

     

       44
       44
       -
       -  unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;

     

       45
       45
       -
       -  unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;

     

       46
       46
       -
       -  unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;

     

       47
       47
       -
       -  unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;

     

       48
       48
       -
       -  unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;

     

       49
       49
       -
       -  unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;

     

       50
       50
       -
          unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;

     

       51
       51
       -
          unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;

     

       52
       52
       -
          unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;

     

       53
       53
       -
       --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       54
       54
       -
       +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h

     

       55
       55
       -
       @@ -983,7 +983,6 @@

     

       56
       56
       -
        

     

       57
       57
       -
        #if SANITIZER_LINUX && !SANITIZER_ANDROID

     

       58
       58
       -
        extern unsigned struct_ax25_parms_struct_sz;

     

       59
       59
       -
       -extern unsigned struct_cyclades_monitor_sz;

     

       60
       60
       -
        extern unsigned struct_input_keymap_entry_sz;

     

       61
       61
       -
        extern unsigned struct_ipx_config_data_sz;

     

       62
       62
       -
        extern unsigned struct_kbdiacrs_sz;

     

       63
       63
       -
       @@ -1328,15 +1327,6 @@

     

       64
       64
       -
        #endif  // SANITIZER_LINUX

     

       65
       65
       -
        

     

       66
       66
       -
        #if SANITIZER_LINUX && !SANITIZER_ANDROID

     

       67
       67
       -
       -extern unsigned IOCTL_CYGETDEFTHRESH;

     

       68
       68
       -
       -extern unsigned IOCTL_CYGETDEFTIMEOUT;

     

       69
       69
       -
       -extern unsigned IOCTL_CYGETMON;

     

       70
       70
       -
       -extern unsigned IOCTL_CYGETTHRESH;

     

       71
       71
       -
       -extern unsigned IOCTL_CYGETTIMEOUT;

     

       72
       72
       -
       -extern unsigned IOCTL_CYSETDEFTHRESH;

     

       73
       73
       -
       -extern unsigned IOCTL_CYSETDEFTIMEOUT;

     

       74
       74
       -
       -extern unsigned IOCTL_CYSETTHRESH;

     

       75
       75
       -
       -extern unsigned IOCTL_CYSETTIMEOUT;

     

       76
       76
       -
        extern unsigned IOCTL_EQL_EMANCIPATE;

     

       77
       77
       -
        extern unsigned IOCTL_EQL_ENSLAVE;

     

       78
       78
       -
        extern unsigned IOCTL_EQL_GETMASTRCFG;

-33

pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch

···

       1
       1
       -
       From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Will Dietz <w@wdtz.org>

     

       3
       3
       -
       Date: Tue, 19 Sep 2017 13:13:06 -0500

     

       4
       4
       -
       Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that

     

       5
       5
       -
        needs it

     

       6
       6
       -
       

     

       7
       7
       -
       ---

     

       8
       8
       -
        cmake/Modules/AddCompilerRT.cmake |  8 ------

     

       9
       9
       -
        test/asan/CMakeLists.txt          | 52 ---------------------------------------

     

       10
       10
       -
        test/tsan/CMakeLists.txt          | 47 -----------------------------------

     

       11
       11
       -
        3 files changed, 107 deletions(-)

     

       12
       12
       -
       

     

       13
       13
       -
       diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake

     

       14
       14
       -
       index bc5fb9ff7..b64eb4246 100644

     

       15
       15
       -
       --- a/cmake/Modules/AddCompilerRT.cmake

     

       16
       16
       -
       +++ b/cmake/Modules/AddCompilerRT.cmake

     

       17
       17
       -
       @@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)

     

       18
       18
       -
                set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")

     

       19
       19
       -
                set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")

     

       20
       20
       -
              endif()

     

       21
       21
       -
       -      if(APPLE)

     

       22
       22
       -
       -        # Ad-hoc sign the dylibs

     

       23
       23
       -
       -        add_custom_command(TARGET ${libname}

     

       24
       24
       -
       -          POST_BUILD  

     

       25
       25
       -
       -          COMMAND codesign --sign - $<TARGET_FILE:${libname}>

     

       26
       26
       -
       -          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}

     

       27
       27
       -
       -        )

     

       28
       28
       -
       -      endif()

     

       29
       29
       -
            endif()

     

       30
       30
       -
            install(TARGETS ${libname}

     

       31
       31
       -
              ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}

     

       32
       32
       -
       2.14.1

     

       33
       33
       -

+3 -6

pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix

···

       29
       29
        
       

     

       30
       30
        
         outputs = [ "out" "dev" ];

     

       31
       31
        
       

     

       32
       32
       -
         patches = [

     

       33
       33
       -
           ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory

     

       34
       34
       -
           # https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.diff but the compiler-rt part of the path is stripped

     

       35
       35
       -
           ./68d5235cb58f988c71b403334cd9482d663841ab.patch

     

       36
       36
       -
           ];

     

       37
       37
       -
       

     

       32
       32
       +
         prePatch = ''

     

       33
       33
       +
           cd compiler-rt

     

       34
       34
       +
         '';

     

       38
       35
        
       

     

       39
       36
        
         # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

     

       40
       37
        
         # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

+3 -3

pkgs/development/compilers/llvm/rocm/default.nix

···

       1
       1
        
       { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "4.5.2";

     

       4
       4
       +
         version = "5.0.2";

     

       5
       5
        
         src = fetchFromGitHub {

     

       6
       6
        
           owner = "RadeonOpenCompute";

     

       7
       7
        
           repo = "llvm-project";

     

       8
       8
        
           rev = "rocm-${version}";

     

       9
       9
       -
           hash = "sha256-XWh81+2yyXQEPO+5SgxHh66fzFG1bVbvnjPfvXDC+fU=";

     

       9
       9
       +
           hash = "sha256-wPzwbeQUFE6RAytrz5lBa6UUPoVL0UeMyY3qa4M6W6M=";

     

       10
       10
        
         };

     

       11
       11
        
       in rec {

     

       12
       12
        
         clang = wrapCCWith rec {

     
···

       47
       47
        
       

     

       48
       48
        
         compiler-rt = callPackage ./compiler-rt {

     

       49
       49
        
           inherit version llvm;

     

       50
       50
       -
           src = "${src}/compiler-rt";

     

       50
       50
       +
           inherit src;

     

       51
       51
        
           stdenv = overrideCC stdenv clangNoCompilerRt;

     

       52
       52
        
         };

     

       53
       53

+3 -1

pkgs/development/compilers/llvm/rocm/llvm/default.nix

···

       59
       59
        
           "-DSPHINX_WARNINGS_AS_ERRORS=OFF"

     

       60
       60
        
         ];

     

       61
       61
        
       

     

       62
       62
       -
         postPatch = lib.optional enableSharedLibraries ''

     

       62
       62
       +
         postPatch = ''

     

       63
       63
       +
           patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh

     

       64
       64
       +
         '' + lib.optionalString enableSharedLibraries ''

     

       63
       65
        
           substitute '${./outputs.patch}' ./outputs.patch --subst-var lib

     

       64
       66
        
           patch -p1 < ./outputs.patch

     

       65
       67
        
         '';

+2 -2

pkgs/development/libraries/rocm-comgr/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "rocm-comgr";

     

       5
       5
       -
         version = "4.5.2";

     

       5
       5
       +
         version = "5.0.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "RadeonOpenCompute";

     

       9
       9
        
           repo = "ROCm-CompilerSupport";

     

       10
       10
        
           rev = "rocm-${version}";

     

       11
       11
       -
           hash = "sha256-enGzu1EOo87/S5oH1eEqPy0AtsBhCcroG3DYemeNgR0=";

     

       11
       11
       +
           hash = "sha256-EIBH7TXelo6mr+/vJ+iT+VLUVoQqWmNsgeN3Nwwr+tM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         sourceRoot = "source/lib/comgr";