commit 3fba1c80f28172fb6430616b3a96859ed806cd0e · pyrox.dev/nixpkgs

+11 -4

pkgs/development/compilers/sbcl/default.nix

···

       153
        
             # have it block a release.

     

       154
        
             "futex-wait.test.sh"

     

       155
        
           ];

     

       156
       -
         patches = [

     

       157
        
           # Support the NIX_SBCL_DYNAMIC_SPACE_SIZE envvar. Upstream SBCL didn’t want

     

       158
        
           # to include this (see

     

       159
        
           # "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"),

     

       160
        
           # but for Nix envvars are sufficiently useful that it’s worth maintaining

     

       161
        
           # this functionality downstream.

     

       162
       -
           ./dynamic-space-size-envvar-feature.patch

     

       163
       -
           ./dynamic-space-size-envvar-tests.patch

     

       164
       -
         ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       165
        
         postPatch =

     

       166
        
           lib.optionalString (self.disabledTestFiles != [ ]) ''

     

       167
        
             (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles})

···

       153
        
             # have it block a release.

     

       154
        
             "futex-wait.test.sh"

     

       155
        
           ];

     

       156
       +
         patches =

     

       157
        
           # Support the NIX_SBCL_DYNAMIC_SPACE_SIZE envvar. Upstream SBCL didn’t want

     

       158
        
           # to include this (see

     

       159
        
           # "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"),

     

       160
        
           # but for Nix envvars are sufficiently useful that it’s worth maintaining

     

       161
        
           # this functionality downstream.

     

       162
       +
           if lib.versionOlder "2.5.2" self.version then

     

       163
       +
             [

     

       164
       +
               ./dynamic-space-size-envvar-2.5.3-feature.patch

     

       165
       +
               ./dynamic-space-size-envvar-2.5.3-tests.patch

     

       166
       +
             ]

     

       167
       +
           else

     

       168
       +
             [

     

       169
       +
               ./dynamic-space-size-envvar-2.5.2-feature.patch

     

       170
       +
               ./dynamic-space-size-envvar-2.5.2-tests.patch

     

       171
       +
             ];

     

       172
        
         postPatch =

     

       173
        
           lib.optionalString (self.disabledTestFiles != [ ]) ''

     

       174
        
             (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles})

+64

pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.3-feature.patch

···

       1
       +
       From 9c899f7b8089eee7ce471f237d2046882298c4fc Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Hraban Luyat <hraban@0brg.net>

     

       3
       +
       Date: Sat, 13 Apr 2024 14:04:57 -0400

     

       4
       +
       Subject: [PATCH 1/2] feat: NIX_SBCL_DYNAMIC_SPACE_SIZE envvar

     

       5
       +
       

     

       6
       +
       ---

     

       7
       +
        src/runtime/runtime.c | 27 +++++++++++++++++++++++++++

     

       8
       +
        1 file changed, 27 insertions(+)

     

       9
       +
       

     

       10
       +
       diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c

     

       11
       +
       index 2b1f8b634..4f3f51139 100644

     

       12
       +
       --- a/src/runtime/runtime.c

     

       13
       +
       +++ b/src/runtime/runtime.c

     

       14
       +
       @@ -416,6 +416,29 @@ static int is_memsize_arg(char *argv[], int argi, int argc, int *merge_core_page

     

       15
       +
            return 0;

     

       16
       +
        }

     

       17
       +
        

     

       18
       +
       +/**

     

       19
       +
       + * Read memory options from the environment, if present.

     

       20
       +
       + *

     

       21
       +
       + * Memory settings are read in the following priority:

     

       22
       +
       + *

     

       23
       +
       + * 1. command line arguments

     

       24
       +
       + * 2. environment variable

     

       25
       +
       + * 3. embedded options in core

     

       26
       +
       + * 4. default

     

       27
       +
       + */

     

       28
       +
       +static void

     

       29
       +
       +read_memsize_from_env(void) {

     

       30
       +
       +  const char *val = getenv("NIX_SBCL_DYNAMIC_SPACE_SIZE");

     

       31
       +
       +  // The distinction is blurry between setting an envvar to the empty string and

     

       32
       +
       +  // unsetting it entirely. Depending on the calling environment it can even be

     

       33
       +
       +  // tricky to properly unset an envvar in the first place. An empty envvar is

     

       34
       +
       +  // practically always intended to just mean “unset”, so let’s interpret it

     

       35
       +
       +  // that way.

     

       36
       +
       +  if (val != NULL && (strcmp(val, "") != 0)) {

     

       37
       +
       +    dynamic_space_size = parse_size_arg(val, "NIX_SBCL_DYNAMIC_SPACE_SIZE");

     

       38
       +
       +  }

     

       39
       +
       +}

     

       40
       +
       +

     

       41
       +
        static struct cmdline_options

     

       42
       +
        parse_argv(struct memsize_options memsize_options,

     

       43
       +
                   int argc, char *argv[], char *envp[], char *core)

     

       44
       +
       @@ -457,6 +480,9 @@ parse_argv(struct memsize_options memsize_options,

     

       45
       +
                thread_control_stack_size = memsize_options.thread_control_stack_size;

     

       46
       +
                dynamic_values_bytes = memsize_options.thread_tls_bytes;

     

       47
       +
                if (memsize_options.present_in_core == 2) {

     

       48
       +
       +            /* Only accept environment variable memory options where you would

     

       49
       +
       +             * accept those options as command-line arguments. */

     

       50
       +
       +            read_memsize_from_env();

     

       51
       +
                    int stop_parsing = 0; // have we seen '--'

     

       52
       +
                    int output_index = 1;

     

       53
       +
        #ifndef LISP_FEATURE_WIN32

     

       54
       +
       @@ -490,6 +516,7 @@ parse_argv(struct memsize_options memsize_options,

     

       55
       +
        #endif

     

       56
       +
                }

     

       57
       +
            } else {

     

       58
       +
       +        read_memsize_from_env();

     

       59
       +
                bool end_runtime_options = 0;

     

       60
       +
                /* Parse our any of the command-line options that we handle from C,

     

       61
       +
                 * stopping at the first one that we don't, and leave the rest */

     

       62
       +
       -- 

     

       63
       +
       2.48.1

     

       64
       +

+130

pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.3-tests.patch

···

       1
       +
       From 979a92d10731bae90e611b98d29be8d187f0f1f8 Mon Sep 17 00:00:00 2001

     

       2
       +
       From: Hraban Luyat <hraban@0brg.net>

     

       3
       +
       Date: Sat, 13 Apr 2024 15:39:58 -0400

     

       4
       +
       Subject: [PATCH 2/2] test: dynamic space size envvar and precedence

     

       5
       +
       

     

       6
       +
       ---

     

       7
       +
        tests/memory-args.test.sh | 22 ++++++++++++++++++

     

       8
       +
        tests/save7.test.sh       | 49 ++++++++++++++++++++++++++++++++++-----

     

       9
       +
        2 files changed, 65 insertions(+), 6 deletions(-)

     

       10
       +
        create mode 100755 tests/memory-args.test.sh

     

       11
       +
       

     

       12
       +
       diff --git a/tests/memory-args.test.sh b/tests/memory-args.test.sh

     

       13
       +
       new file mode 100755

     

       14
       +
       index 000000000..72ef0cc79

     

       15
       +
       --- /dev/null

     

       16
       +
       +++ b/tests/memory-args.test.sh

     

       17
       +
       @@ -0,0 +1,22 @@

     

       18
       +
       +#!/bin/sh

     

       19
       +
       +

     

       20
       +
       +. ./subr.sh

     

       21
       +
       +

     

       22
       +
       +use_test_subdirectory

     

       23
       +
       +

     

       24
       +
       +set -e

     

       25
       +
       +

     

       26
       +
       +# Allow slight shrinkage if heap relocation has to adjust for alignment

     

       27
       +
       +NIX_SBCL_DYNAMIC_SPACE_SIZE=234mb run_sbcl_with_args --script <<EOF

     

       28
       +
       +(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))

     

       29
       +
       +EOF

     

       30
       +
       +

     

       31
       +
       +NIX_SBCL_DYNAMIC_SPACE_SIZE=555mb run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF

     

       32
       +
       +(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))

     

       33
       +
       +EOF

     

       34
       +
       +

     

       35
       +
       +run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF

     

       36
       +
       +(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))

     

       37
       +
       +EOF

     

       38
       +
       +

     

       39
       +
       +exit $EXIT_TEST_WIN

     

       40
       +
       diff --git a/tests/save7.test.sh b/tests/save7.test.sh

     

       41
       +
       index dd112f220..d56bddbc2 100644

     

       42
       +
       --- a/tests/save7.test.sh

     

       43
       +
       +++ b/tests/save7.test.sh

     

       44
       +
       @@ -25,6 +25,9 @@ echo "::: Success"

     

       45
       +
        

     

       46
       +
        run_sbcl_with_args --noinform --control-stack-size 384KB --dynamic-space-size 260MB \

     

       47
       +
            --disable-debugger --no-userinit --no-sysinit --noprint <<EOF

     

       48
       +
       +  ; allow slight shrinkage if heap relocation has to adjust for alignment

     

       49
       +
       +  (defun dynamic-space-size-good-p (expected-mb)

     

       50
       +
       +    (<= 0 (- (* expected-mb 1024 1024) (dynamic-space-size)) 65536))

     

       51
       +
          (save-lisp-and-die "$tmpcore" :executable t :save-runtime-options :accept-runtime-options)

     

       52
       +
        EOF

     

       53
       +
        chmod u+x "$tmpcore"

     

       54
       +
       @@ -57,6 +60,29 @@ if [ $? -ne 0 ]; then

     

       55
       +
        fi

     

       56
       +
        echo "::: Success"

     

       57
       +
        

     

       58
       +
       +echo "::: Running :DYNAMIC-SPACE-SIZE-ENV-ACCEPT"

     

       59
       +
       +NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"$tmpcore" --no-userinit --no-sysinit --noprint <<EOF

     

       60
       +
       +  (when (dynamic-space-size-good-p 432)

     

       61
       +
       +    (exit :code 42))

     

       62
       +
       +EOF

     

       63
       +
       +if [ $? -ne 42 ]; then

     

       64
       +
       +  exit 1

     

       65
       +
       +fi

     

       66
       +
       +echo "::: Success"

     

       67
       +
       +

     

       68
       +
       +echo "::: Running :DYNAMIC-SPACE-SIZE-PRECEDENCE"

     

       69
       +
       +NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"$tmpcore" --dynamic-space-size 333MB \

     

       70
       +
       +  --no-userinit --no-sysinit --noprint <<EOF

     

       71
       +
       +  (when (dynamic-space-size-good-p 333))

     

       72
       +
       +    (exit :code 42))

     

       73
       +
       +EOF

     

       74
       +
       +status=$?

     

       75
       +
       +if [ $status -ne 42 ]; then

     

       76
       +
       +    echo "saved core should have prioritized memory specification from arg"

     

       77
       +
       +    exit 1

     

       78
       +
       +fi

     

       79
       +
       +echo "::: Success"

     

       80
       +
       +

     

       81
       +
        echo "::: Running :DYNAMIC-SPACE-SIZE-ARG"

     

       82
       +
        run_sbcl_with_core "$tmpcore" --noinform --control-stack-size 640KB \

     

       83
       +
            --tls-limit 5000 \

     

       84
       +
       @@ -64,10 +90,7 @@ run_sbcl_with_core "$tmpcore" --noinform --control-stack-size 640KB \

     

       85
       +
          (assert (eql (extern-alien "thread_control_stack_size" unsigned) (* 640 1024)))

     

       86
       +
          (assert (eql (extern-alien "dynamic_values_bytes" (unsigned 32))

     

       87
       +
                       (* 5000 sb-vm:n-word-bytes)))

     

       88
       +
       -  ; allow slight shrinkage if heap relocation has to adjust for alignment

     

       89
       +
       -  (defun dynamic-space-size-good-p ()

     

       90
       +
       -    (<= 0 (- (* 260 1048576) (dynamic-space-size)) 65536))

     

       91
       +
       -  (assert (dynamic-space-size-good-p))

     

       92
       +
       +  (assert (dynamic-space-size-good-p 260))

     

       93
       +
          (save-lisp-and-die "${tmpcore}2" :executable t :save-runtime-options t)

     

       94
       +
        EOF

     

       95
       +
        chmod u+x "${tmpcore}2"

     

       96
       +
       @@ -76,15 +99,29 @@ echo "::: INFO: prepared test core"

     

       97
       +
          (when (and (eql (extern-alien "thread_control_stack_size" unsigned) (* 640 1024))

     

       98
       +
                     (eql (extern-alien "dynamic_values_bytes" (unsigned 32))

     

       99
       +
                          (* 5000 sb-vm:n-word-bytes))

     

       100
       +
       -             (dynamic-space-size-good-p))

     

       101
       +
       +             (dynamic-space-size-good-p 260))

     

       102
       +
            (exit :code 42))

     

       103
       +
        EOF

     

       104
       +
        status=$?

     

       105
       +
       -rm "$tmpcore" "${tmpcore}2"

     

       106
       +
        if [ $status -ne 42 ]; then

     

       107
       +
            echo "re-saved executable used wrong memory size options"

     

       108
       +
            exit 1

     

       109
       +
        fi

     

       110
       +
        echo "::: Success"

     

       111
       +
        

     

       112
       +
       +echo "::: Running :DYNAMIC-SPACE-SIZE-ENV-IGNORE"

     

       113
       +
       +NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"${tmpcore}2" --no-userinit --no-sysinit --noprint <<EOF

     

       114
       +
       +  (when (dynamic-space-size-good-p 260)

     

       115
       +
       +    (exit :code 42))

     

       116
       +
       +EOF

     

       117
       +
       +status=$?

     

       118
       +
       +if [ $status -ne 42 ]; then

     

       119
       +
       +    echo "re-saved executable should have ignored memory specification from env"

     

       120
       +
       +    exit 1

     

       121
       +
       +fi

     

       122
       +
       +echo "::: Success"

     

       123
       +
       +rm "$tmpcore" "${tmpcore}2"

     

       124
       +
       +

     

       125
       +
       +

     

       126
       +
       +

     

       127
       +
        exit $EXIT_TEST_WIN

     

       128
       +
       -- 

     

       129
       +
       2.48.1

     

       130
       +

pkgs/development/compilers/sbcl/dynamic-space-size-envvar-feature.patch pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.2-feature.patch

pkgs/development/compilers/sbcl/dynamic-space-size-envvar-tests.patch pkgs/development/compilers/sbcl/dynamic-space-size-envvar-2.5.2-tests.patch