Package: guix-patches;
Reported by: soeren <at> soeren-tempel.net
Date: Sat, 6 Jan 2024 20:50:01 UTC
Severity: normal
Tags: patch
Done: Sören Tempel <soeren <at> soeren-tempel.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68296 in the body.
You can then email your comments to 68296 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Sat, 06 Jan 2024 20:50:01 GMT) Full text and rfc822 format available.soeren <at> soeren-tempel.net
:guix-patches <at> gnu.org
.
(Sat, 06 Jan 2024 20:50:01 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: guix-patches <at> gnu.org Subject: [PATCH] gnu: Add KLEE. Date: Sat, 6 Jan 2024 21:40:41 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee-uclibc): New variable. * gnu/packages/check.scm (klee): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- This is a new package for KLEE, a popular piece of academic software in the software engineering domain. KLEE implements a technique called symbolic execution <https://en.wikipedia.org/wiki/Symbolic_execution> which allows for automated testing of software through SMT solving. KLEE forms the basis for a lot of research in the symbolic execution domain <https://klee.github.io/publications/>. Packaging KLEE and other related tools, eases using Guix for conducting reproducible research in this domain. I have Guix packages for other symbolic execution tools which I also would like to upstream in the future, I figured I would start with KLEE as it has little to no dependencies. I tested this package by conforming that the basic upstream tutorials work as intended, e.g. <https://klee.github.io/tutorials/testing-function/>. This is my first Guix package, hence CC'ing the mentors. gnu/packages/check.scm | 107 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5181d3a164..7e97e59955 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -71,6 +71,7 @@ (define-module (gnu packages check) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages glib) @@ -79,6 +80,8 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -87,6 +90,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -3648,3 +3652,106 @@ (define-public subunit command line filters to process a subunit stream and language bindings for Python, C, C++ and shell. Bindings are easy to write for other languages.") (license (list license:asl2.0 license:bsd-3)))) ;user can pick + +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux")) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" + "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib"))))))) + (inputs (list clang-toolchain-13 python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee.github.io/") + (license license:lgpl2.1)))) + +(define-public klee + (package + (name "klee") + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee") + (commit (string-append "v" version)))) + (sha256 + (base32 "0dj20nazkcq84ryr87dihvjznapsbl1n21sa8dhhnb0wsad5d6fb")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (supported-systems '("x86_64-linux")) + (arguments + `(#:test-target "systemtests" + #:strip-directories '("bin") + #:configure-flags ,#~(list "-DENABLE_KLEE_ASSERTS=OFF" + "-DENABLE_TCMALLOC=ON" + "-DENABLE_POSIX_RUNTIME=ON" + (string-append "-DKLEE_UCLIBC_PATH=" + #$klee-uclibc)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-lit-config + (lambda _ + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))))) + (propagated-inputs (list klee-uclibc clang-toolchain-13 llvm-13 python + python-tabulate)) + (inputs (list python-lit z3 gperftools sqlite)) + (synopsis + "Symbolic execution engine built on top of the LLVM compiler infastructure") + (description + "Dynamic symbolic execution engine built on top of +LLVM. Symbolic execution is an automated software testing technique, +KLEE leverage this technique to automatically generate test cases for +software compiled to LLVM IR.") + (home-page "https://klee.github.io/") + (license (list license:expat license:bsd-4)))) base-commit: 29c94dd522833b2603a651c14a5b06120bcf1829
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Tue, 13 Feb 2024 08:50:02 GMT) Full text and rfc822 format available.Message #8 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: Julien Lepiller <julien <at> lepiller.eu> To: guix-patches <at> gnu.org, soeren <at> soeren-tempel.net, 68296 <at> debbugs.gnu.org Subject: Re: [bug#68296] [PATCH] gnu: Add KLEE. Date: Tue, 13 Feb 2024 09:49:12 +0100
Le 6 janvier 2024 21:40:41 GMT+01:00, soeren <at> soeren-tempel.net a écrit : >From: Sören Tempel <soeren <at> soeren-tempel.net> > >* gnu/packages/check.scm (klee-uclibc): New variable. >* gnu/packages/check.scm (klee): New variable. > >Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> >--- >This is a new package for KLEE, a popular piece of academic software >in the software engineering domain. KLEE implements a technique called >symbolic execution <https://en.wikipedia.org/wiki/Symbolic_execution> >which allows for automated testing of software through SMT solving. >KLEE forms the basis for a lot of research in the symbolic execution >domain <https://klee.github.io/publications/>. Packaging KLEE and >other related tools, eases using Guix for conducting reproducible >research in this domain. I have Guix packages for other symbolic >execution tools which I also would like to upstream in the future, >I figured I would start with KLEE as it has little to no dependencies. > >I tested this package by conforming that the basic upstream tutorials >work as intended, e.g. <https://klee.github.io/tutorials/testing-function/>. > >This is my first Guix package, hence CC'ing the mentors. > > gnu/packages/check.scm | 107 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 107 insertions(+) > >diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm >index 5181d3a164..7e97e59955 100644 >--- a/gnu/packages/check.scm >+++ b/gnu/packages/check.scm >@@ -71,6 +71,7 @@ (define-module (gnu packages check) > #:use-module (gnu packages bash) > #:use-module (gnu packages cmake) > #:use-module (gnu packages compression) >+ #:use-module (gnu packages cpp) > #:use-module (gnu packages linux) > #:use-module (gnu packages llvm) > #:use-module (gnu packages glib) >@@ -79,6 +80,8 @@ (define-module (gnu packages check) > #:use-module (gnu packages gtk) > #:use-module (gnu packages guile) > #:use-module (gnu packages guile-xyz) >+ #:use-module (gnu packages maths) >+ #:use-module (gnu packages ncurses) > #:use-module (gnu packages perl) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages python) >@@ -87,6 +90,7 @@ (define-module (gnu packages check) > #:use-module (gnu packages python-web) > #:use-module (gnu packages python-xyz) > #:use-module (gnu packages python-science) >+ #:use-module (gnu packages sqlite) > #:use-module (gnu packages texinfo) > #:use-module (gnu packages time) > #:use-module (gnu packages xml) >@@ -3648,3 +3652,106 @@ (define-public subunit > command line filters to process a subunit stream and language bindings for > Python, C, C++ and shell. Bindings are easy to write for other languages.") > (license (list license:asl2.0 license:bsd-3)))) ;user can pick >+ >+(define-public klee-uclibc >+ (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) >+ (package >+ (name "klee-uclibc") >+ (version (git-version "20230612" "0" commit)) >+ (source >+ (origin >+ (method git-fetch) >+ (uri (git-reference >+ (url "https://github.com/klee/klee-uclibc") >+ (commit commit))) >+ (file-name (git-file-name name version)) >+ (sha256 >+ (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) >+ (build-system gnu-build-system) >+ (supported-systems '("x86_64-linux")) >+ (arguments >+ `(#:tests? #f ;upstream uClibc tests do not work in the fork >+ #:phases (modify-phases %standard-phases >+ ;; Disable locales as these would have to be downloaded and >+ ;; shouldn't really be needed for symbolic execution either. >+ (add-after 'unpack 'patch-config >+ (lambda _ >+ (substitute* "klee-premade-configs/x86_64/config" >+ (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") >+ "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") >+ (("UCLIBC_PREGENERATED_LOCALE_DATA=y") >+ "UCLIBC_PREGENERATED_LOCALE_DATA=n") >+ (("UCLIBC_HAS_LOCALE=y") >+ "UCLIBC_HAS_LOCALE=n") >+ (("UCLIBC_HAS_XLOCALE=y") >+ "UCLIBC_HAS_XLOCALE=n")))) >+ >+ ;; Upstream uses a custom non-GNU configure script written >+ ;; in Python, replace the default configure phase accordingly. >+ (replace 'configure >+ (lambda _ >+ (invoke "./configure" >+ "--make-llvm-lib" >+ "--enable-release"))) >+ >+ ;; Custom install phase to only install the libc.a file manually. >+ ;; This is the only file which is used/needed by KLEE itself. >+ (replace 'install >+ (lambda* (#:key outputs #:allow-other-keys) >+ (install-file "lib/libc.a" >+ (string-append (assoc-ref outputs "out") >+ "/lib"))))))) >+ (inputs (list clang-toolchain-13 python ncurses)) >+ (synopsis "Variant of uClibc tailored to symbolic execution") >+ (description >+ "Modified version of uClibc for symbolic execution of >+Unix userland software. This library can only be used in conjunction >+with the @code{klee} package.") >+ (home-page "https://klee.github.io/") >+ (license license:lgpl2.1)))) >+ >+(define-public klee >+ (package >+ (name "klee") >+ (version "3.0") >+ (source >+ (origin >+ (method git-fetch) >+ (uri (git-reference >+ (url "https://github.com/klee/klee") >+ (commit (string-append "v" version)))) >+ (sha256 >+ (base32 "0dj20nazkcq84ryr87dihvjznapsbl1n21sa8dhhnb0wsad5d6fb")) >+ (file-name (git-file-name name version)))) >+ (build-system cmake-build-system) >+ (supported-systems '("x86_64-linux")) >+ (arguments >+ `(#:test-target "systemtests" >+ #:strip-directories '("bin") >+ #:configure-flags ,#~(list "-DENABLE_KLEE_ASSERTS=OFF" >+ "-DENABLE_TCMALLOC=ON" >+ "-DENABLE_POSIX_RUNTIME=ON" >+ (string-append "-DKLEE_UCLIBC_PATH=" >+ #$klee-uclibc)) >+ #:phases (modify-phases %standard-phases >+ (add-after 'unpack 'patch-lit-config >+ (lambda _ >+ ;; Make sure that we retain the value of the GUIX_PYTHONPATH >+ ;; environment variable in the test environmented created by >+ ;; python-lit. Otherwise, the test scripts won't be able to >+ ;; find the python-tabulate dependency, causing test failures. >+ (substitute* "test/lit.cfg" >+ (("addEnv\\('PWD'\\)" env) >+ (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))))) >+ (propagated-inputs (list klee-uclibc clang-toolchain-13 llvm-13 python >+ python-tabulate)) >+ (inputs (list python-lit z3 gperftools sqlite)) >+ (synopsis >+ "Symbolic execution engine built on top of the LLVM compiler infastructure") >+ (description >+ "Dynamic symbolic execution engine built on top of >+LLVM. Symbolic execution is an automated software testing technique, >+KLEE leverage this technique to automatically generate test cases for >+software compiled to LLVM IR.") >+ (home-page "https://klee.github.io/") >+ (license (list license:expat license:bsd-4)))) > >base-commit: 29c94dd522833b2603a651c14a5b06120bcf1829 > > > Hi Sören, I'm sorry nobody looked at this before. Here are a few remarks. First, could you separate this in two patches, one per package? Is there a reason why this is limited to the x86_64 architecture? You have mixed native and normal inputs. In uclibc, since python is only used for the build, it should be native. Does it make sense to propagate uclibc in klee, when it only contains a static library? Some for clang and llvm. Isn't z3 used at runtime? Shouldn't it be propagated? Using #$klee-uclibc directly in the phase could be problematic I think, you should use this-package-inputs or similar (can't remember the exact name or syntax right now, you can leave it to me if you don't find it). Otherwise, looks good for a first patch :)
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Tue, 13 Feb 2024 08:52:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Tue, 13 Feb 2024 14:10:02 GMT) Full text and rfc822 format available.Message #14 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: 68296 <at> debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: Add klee-uclibc. Date: Tue, 13 Feb 2024 15:08:51 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee-uclibc): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- gnu/packages/check.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4f593cde8d..ecf48ab121 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2023 Reza Housseini <reza <at> housseini.me> ;;; Copyright © 2023 Hilton Chain <hako <at> ultrarare.space> ;;; Copyright © 2023 Troy Figiel <troy <at> troyfigiel.com> +;;; Copyright © 2024 Sören Tempel <soeren <at> soeren-tempel.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -3610,3 +3612,63 @@ (define-public subunit command line filters to process a subunit stream and language bindings for Python, C, C++ and shell. Bindings are easy to write for other languages.") (license (list license:asl2.0 license:bsd-3)))) ;user can pick + +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" + "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib"))))))) + (inputs (list clang-toolchain-13)) + ;; ncurses is only needed for the `make menuconfig` interface. + (native-inputs (list python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee.github.io/") + (license license:lgpl2.1)))) base-commit: 85e67f7feac14a1290022b9500c333c51c7f3ca3
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Tue, 13 Feb 2024 14:10:02 GMT) Full text and rfc822 format available.Message #17 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: 68296 <at> debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: Add klee. Date: Tue, 13 Feb 2024 15:08:52 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- gnu/packages/check.scm | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index ecf48ab121..82c40b63b1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -73,6 +73,7 @@ (define-module (gnu packages check) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages glib) @@ -81,6 +82,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -90,6 +92,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -3672,3 +3675,52 @@ (define-public klee-uclibc with the @code{klee} package.") (home-page "https://klee.github.io/") (license license:lgpl2.1)))) + +(define-public klee + (package + (name "klee") + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee") + (commit (string-append "v" version)))) + (sha256 + (base32 "0dj20nazkcq84ryr87dihvjznapsbl1n21sa8dhhnb0wsad5d6fb")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:test-target "systemtests" + #:strip-directories '("bin") + #:configure-flags ,#~(list "-DENABLE_KLEE_ASSERTS=OFF" + "-DENABLE_TCMALLOC=ON" + "-DENABLE_POSIX_RUNTIME=ON" + (string-append "-DKLEE_UCLIBC_PATH=" + #$klee-uclibc)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-lit-config + (lambda _ + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))))) + ;; KLEE operates on LLVM IR generated by a specific toolchain version. + ;; Propergate the toolchain to allow users to transform code to this version. + (propagated-inputs (list clang-toolchain-13 llvm-13 python python-tabulate)) + (inputs (list z3 gperftools sqlite)) + (native-inputs (list python-lit)) + (synopsis + "Symbolic execution engine built on top of the LLVM compiler infastructure") + (description + "Dynamic symbolic execution engine built on top of +LLVM. Symbolic execution is an automated software testing technique, +KLEE leverage this technique to automatically generate test cases for +software compiled to LLVM IR.") + (home-page "https://klee.github.io/") + (license (list license:expat license:bsd-4))))
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Tue, 13 Feb 2024 14:11:01 GMT) Full text and rfc822 format available.Message #20 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Sören Tempel <soeren <at> soeren-tempel.net> To: Julien Lepiller <julien <at> lepiller.eu> Cc: 68296 <at> debbugs.gnu.org, guix-patches <at> gnu.org Subject: Re: [bug#68296] [PATCH] gnu: Add KLEE. Date: Tue, 13 Feb 2024 15:09:12 +0100
Hi Julien, Thanks a lot for your feedback! I send an updated revision of the patchset based on your feedback. More information on changes below. Julien Lepiller <julien <at> lepiller.eu> wrote: > First, could you separate this in two patches, one per package? Sorry, oversight on my part. Fixed! > Is there a reason why this is limited to the x86_64 architecture? Yes, despite operating on LLVM IR abstraction, KLEE is tightly integrated with the host architecture. Therefore, upstream currently only support x86_64. Packages for other package manager (e.g. Nix) also only support KLEE on x86_64 [1]. I added a comment explaining this. > You have mixed native and normal inputs. In uclibc, since python is > only used for the build, it should be native. Fixed, ncurses should also be native as it is only used for menuconfig. > Does it make sense to propagate uclibc in klee, when it only contains > a static library? Some for clang and llvm. Isn't z3 used at runtime? > Shouldn't it be propagated? Sorry, I should have done a better job at explaining this: KLEE is a symbolic analyzer for LLVM IR. Users of KLEE will need to translate their C/C++ source to LLVM IR in order to analyze it with KLEE [2]. Furthermore, as KLEE is tightly integrated with a specific LLVM version, it makes (at least from my point of view) sense to propagate a specific clang toolchain so users can just run `guix shell klee` and get started with it. However, if preferred I can also remove the propagation. z3 isn't used at runtime, KLEE just uses the Z3 library interface and links against z3. AFAIK, it doesn't use any binaries from z3. Does z3 still need to be propagated in this case? uclibc does not need to be a propagated input since the KLEE build systems generates LLVM IR from the .a archive [3]. I fixed this. > Using #$klee-uclibc directly in the phase could be problematic I > think, you should use this-package-inputs or similar (can't remember > the exact name or syntax right now, you can leave it to me if you > don't find it). Sorry, I am new to Guix so I am not sure what you mean. Let me know if you have more information on this but also feel free to just adjust this as you wish :) Greetings Sören [1]: https://github.com/NixOS/nixpkgs/blob/40a7b182e0a00245d69f6b8c1dfd3ea4bfc6257c/pkgs/applications/science/logic/klee/default.nix [2]: https://klee.github.io/tutorials/testing-function/#compiling-to-llvm-bitcode [3]: https://github.com/klee/klee/blob/v3.0/CMakeLists.txt#L473-L487
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Tue, 13 Feb 2024 14:11:02 GMT) Full text and rfc822 format available.guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Wed, 28 Feb 2024 17:41:03 GMT) Full text and rfc822 format available.Message #26 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: 68296 <at> debbugs.gnu.org Subject: [PATCH v3 1/2] gnu: Add klee-uclibc. Date: Wed, 28 Feb 2024 18:04:45 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee-uclibc): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- Changes since v2: Rebase against the current master branch, this resolves a merge conflict in the copyright comment section. No functional changes. gnu/packages/check.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5428098c15..50fd105b2c 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2023 Hilton Chain <hako <at> ultrarare.space> ;;; Copyright © 2023 Troy Figiel <troy <at> troyfigiel.com> ;;; Copyright © 2024 Giacomo Leidi <goodoldpaul <at> autistici.org> +;;; Copyright © 2024 Sören Tempel <soeren <at> soeren-tempel.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -3635,3 +3637,63 @@ (define-public subunit command line filters to process a subunit stream and language bindings for Python, C, C++ and shell. Bindings are easy to write for other languages.") (license (list license:asl2.0 license:bsd-3)))) ;user can pick + +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" + "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib"))))))) + (inputs (list clang-toolchain-13)) + ;; ncurses is only needed for the `make menuconfig` interface. + (native-inputs (list python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee.github.io/") + (license license:lgpl2.1)))) base-commit: bc6840316c665e5959469e5c857819142cc4a47b
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Wed, 28 Feb 2024 17:41:03 GMT) Full text and rfc822 format available.Message #29 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: 68296 <at> debbugs.gnu.org Subject: [PATCH v3 2/2] gnu: Add klee. Date: Wed, 28 Feb 2024 18:04:48 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- Changes since v2: Switch to a non-debug build-type to workaround an internal error being triggered in clang while building KLEE with it. gnu/packages/check.scm | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 50fd105b2c..534852f029 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -74,6 +74,7 @@ (define-module (gnu packages check) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages glib) @@ -83,6 +84,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -92,6 +94,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -3697,3 +3700,55 @@ (define-public klee-uclibc with the @code{klee} package.") (home-page "https://klee.github.io/") (license license:lgpl2.1)))) + +(define-public klee + (package + (name "klee") + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee") + (commit (string-append "v" version)))) + (sha256 + (base32 "0dj20nazkcq84ryr87dihvjznapsbl1n21sa8dhhnb0wsad5d6fb")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:test-target "systemtests" + ;; Default build type (RelWithDebInfo) causes an internal error + ;; in clang while compiling KLEE, hence use a different build type. + #:build-type "Release" + #:strip-directories '("bin") + #:configure-flags ,#~(list "-DENABLE_KLEE_ASSERTS=OFF" + "-DENABLE_TCMALLOC=ON" + "-DENABLE_POSIX_RUNTIME=ON" + (string-append "-DKLEE_UCLIBC_PATH=" + #$klee-uclibc)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-lit-config + (lambda _ + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))))) + ;; KLEE operates on LLVM IR generated by a specific toolchain version. + ;; Propergate the toolchain to allow users to transform code to this version. + (propagated-inputs (list clang-toolchain-13 llvm-13 python python-tabulate)) + (inputs (list z3 gperftools sqlite)) + (native-inputs (list python-lit)) + (synopsis + "Symbolic execution engine built on top of the LLVM compiler infastructure") + (description + "Dynamic symbolic execution engine built on top of +LLVM. Symbolic execution is an automated software testing technique, +KLEE leverage this technique to automatically generate test cases for +software compiled to LLVM IR.") + (home-page "https://klee.github.io/") + (license (list license:expat license:bsd-4))))
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Mon, 11 Mar 2024 09:55:01 GMT) Full text and rfc822 format available.Message #32 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: Sören Tempel <soeren <at> soeren-tempel.net> To: 68296 <at> debbugs.gnu.org Subject: Re: gnu: Add KLEE. Date: Mon, 11 Mar 2024 10:54:03 +0100
Hi, What does "QA: Investigate" mean? The build should be fixed now with the v3 revision. I don't see any build failures on the QA. Is there anything I need to do on my end in order to have the build restarted? Greetings Sören
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Thu, 28 Mar 2024 19:22:02 GMT) Full text and rfc822 format available.Message #35 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: 68296 <at> debbugs.gnu.org Cc: julien <at> lepiller.eu Subject: [PATCH v4 1/2] gnu: Add klee-uclibc. Date: Thu, 28 Mar 2024 20:20:18 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee-uclibc): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- Change since v3: Resolve merge conflict, update KLEE website. gnu/packages/check.scm | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7fd28c3ac7..9beba88788 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2024 Giacomo Leidi <goodoldpaul <at> autistici.org> ;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com> ;;; Copyright © 2024 Navid Afkhami <navid.afkhami <at> mdc-berlin.de> +;;; Copyright © 2024 Sören Tempel <soeren <at> soeren-tempel.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,6 +85,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -3705,3 +3707,63 @@ (define-public subunit command line filters to process a subunit stream and language bindings for Python, C, C++ and shell. Bindings are easy to write for other languages.") (license (list license:asl2.0 license:bsd-3)))) ;user can pick + +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" + "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib"))))))) + (inputs (list clang-toolchain-13)) + ;; ncurses is only needed for the `make menuconfig` interface. + (native-inputs (list python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee-se.org/") + (license license:lgpl2.1)))) base-commit: daab3da5042a5803ffa13ee759b3f8895dd92de4
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Thu, 28 Mar 2024 19:22:02 GMT) Full text and rfc822 format available.Message #38 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: soeren <at> soeren-tempel.net To: 68296 <at> debbugs.gnu.org Cc: julien <at> lepiller.eu Subject: [PATCH v4 2/2] gnu: Add klee. Date: Thu, 28 Mar 2024 20:20:19 +0100
From: Sören Tempel <soeren <at> soeren-tempel.net> * gnu/packages/check.scm (klee): New variable. Signed-off-by: Sören Tempel <soeren <at> soeren-tempel.net> --- Change since v3: Update KLEE website. gnu/packages/check.scm | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 9beba88788..f936bb12c1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -76,6 +76,7 @@ (define-module (gnu packages check) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages glib) @@ -85,6 +86,7 @@ (define-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages maths) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -94,6 +96,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -3767,3 +3770,55 @@ (define-public klee-uclibc with the @code{klee} package.") (home-page "https://klee-se.org/") (license license:lgpl2.1)))) + +(define-public klee + (package + (name "klee") + (version "3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee") + (commit (string-append "v" version)))) + (sha256 + (base32 "0dj20nazkcq84ryr87dihvjznapsbl1n21sa8dhhnb0wsad5d6fb")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + ;; Only x86_64 is presently supported by KLEE upstream. + (supported-systems '("x86_64-linux")) + (arguments + `(#:test-target "systemtests" + ;; Default build type (RelWithDebInfo) causes an internal error + ;; in clang while compiling KLEE, hence use a different build type. + #:build-type "Release" + #:strip-directories '("bin") + #:configure-flags ,#~(list "-DENABLE_KLEE_ASSERTS=OFF" + "-DENABLE_TCMALLOC=ON" + "-DENABLE_POSIX_RUNTIME=ON" + (string-append "-DKLEE_UCLIBC_PATH=" + #$klee-uclibc)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-lit-config + (lambda _ + ;; Make sure that we retain the value of the GUIX_PYTHONPATH + ;; environment variable in the test environmented created by + ;; python-lit. Otherwise, the test scripts won't be able to + ;; find the python-tabulate dependency, causing test failures. + (substitute* "test/lit.cfg" + (("addEnv\\('PWD'\\)" env) + (string-append env "\n" "addEnv('GUIX_PYTHONPATH')")))))))) + ;; KLEE operates on LLVM IR generated by a specific toolchain version. + ;; Propergate the toolchain to allow users to transform code to this version. + (propagated-inputs (list clang-toolchain-13 llvm-13 python python-tabulate)) + (inputs (list z3 gperftools sqlite)) + (native-inputs (list python-lit)) + (synopsis + "Symbolic execution engine built on top of the LLVM compiler infastructure") + (description + "Dynamic symbolic execution engine built on top of +LLVM. Symbolic execution is an automated software testing technique, +KLEE leverage this technique to automatically generate test cases for +software compiled to LLVM IR.") + (home-page "https://klee-se.org/") + (license (list license:expat license:bsd-4))))
guix-patches <at> gnu.org
:bug#68296
; Package guix-patches
.
(Sun, 23 Jun 2024 13:48:02 GMT) Full text and rfc822 format available.Message #41 received at 68296 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: soeren <at> soeren-tempel.net, 68296 <at> debbugs.gnu.org Cc: julien <at> lepiller.eu Subject: Re: [PATCH v4 2/2] gnu: Add klee. Date: Sun, 23 Jun 2024 15:46:11 +0200
Hi Sören, hi Julien Am Donnerstag, dem 28.03.2024 um 20:20 +0100 schrieb soeren <at> soeren-tempel.net: > From: Sören Tempel <soeren <at> soeren-tempel.net> > > * gnu/packages/check.scm (klee): New variable. I pushed 71634 earlier today, which adds klee, but not klee-uclibc – would you mind taking a look at it and adding any missing bits? Cheers
Sören Tempel <soeren <at> soeren-tempel.net>
:soeren <at> soeren-tempel.net
:Message #46 received at 68296-done <at> debbugs.gnu.org (full text, mbox):
From: Sören Tempel <soeren <at> soeren-tempel.net> To: 68296-done <at> debbugs.gnu.org Subject: Re: [PATCH] gnu: Add KLEE. Date: Mon, 13 Jan 2025 18:52:06 +0100
Hi, klee has been added in fe7c898750e3fdad586ab3929c67b4b4643ffece, klee-uclibc has been added as well in a follow-up commit, namely 3bdaa223b363b6986baa4bfa11f629f6ba974bba. Hence, this can be closed.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org
.
(Tue, 11 Feb 2025 12:24:11 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.