--- Begin Message ---
|
Subject: |
[PATCH 2/4] inferior: Memoize inferior-package->manifest-entry. |
|
Date: |
Mon, 25 Jan 2021 14:37:36 +0100 |
* guix/inferior.scm (inferior-package->manifest-entry): Memoize.
---
guix/inferior.scm | 55 ++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 25 deletions(-)
diff --git a/guix/inferior.scm b/guix/inferior.scm
index da6983d9a6..7bfce5d810 100644
--- a/guix/inferior.scm
+++ b/guix/inferior.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -639,31 +640,35 @@ failing when GUIX is too old and lacks the 'guix repl'
command."
;;; Manifest entries.
;;;
-(define* (inferior-package->manifest-entry package
- #:optional (output "out")
- #:key (parent (delay #f))
- (properties '()))
- "Return a manifest entry for the OUTPUT of package PACKAGE."
- ;; For each dependency, keep a promise pointing to its "parent" entry.
- (letrec* ((deps (map (match-lambda
- ((label package)
- (inferior-package->manifest-entry package
- #:parent (delay
entry)))
- ((label package output)
- (inferior-package->manifest-entry package output
- #:parent (delay
entry))))
- (inferior-package-propagated-inputs package)))
- (entry (manifest-entry
- (name (inferior-package-name package))
- (version (inferior-package-version package))
- (output output)
- (item package)
- (dependencies (delete-duplicates deps))
- (search-paths
- (inferior-package-transitive-native-search-paths
package))
- (parent parent)
- (properties properties))))
- entry))
+(define inferior-package->manifest-entry
+ (let ((results vlist-null))
+ (lambda* (package #:optional (output "out")
+ #:key (parent (delay #f))
+ (properties '()))
+ "Return a manifest entry for the OUTPUT of package PACKAGE."
+ (or (and=> (vhash-assoc package results) cdr)
+ ;; For each dependency, keep a promise pointing to its "parent"
entry.
+ (letrec* ((deps (map (match-lambda
+ ((label package)
+ (inferior-package->manifest-entry package
+ #:parent
(delay entry)))
+ ((label package output)
+ (inferior-package->manifest-entry package
output
+ #:parent
(delay entry))))
+ (inferior-package-propagated-inputs package)))
+ (entry (manifest-entry
+ (name (inferior-package-name package))
+ (version (inferior-package-version package))
+ (output output)
+ (item package)
+ (dependencies (delete-duplicates deps))
+ (search-paths
+ (inferior-package-transitive-native-search-paths
package))
+ (parent parent)
+ (properties properties))))
+ (begin
+ (set! results (vhash-cons package entry results))
+ entry))))))
;;;
--
2.29.2
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: bug#46100: [PATCH 0/4] Memoize inferior package access. |
|
Date: |
Thu, 28 Jan 2021 14:16:47 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) |
Ricardo Wurmus <rekado@elephly.net> skribis:
> Ludovic Courtès <ludo@gnu.org> writes:
>
>> I pushed it as 0f20b3fa2050ba6e442e340a204516b9375cd231.
>
> Thanks!
>
>> I wonder if the other patches improve the situation. If you run the
>> same test case with:
>>
>> GUIX_PROFILING=memoization
>>
>> what hit rates does it show for these spots?
>
> Memoization: 15 tables, 2 non-empty
> guix/inferior.scm:438:2: 403 entries, 403 lookups, 0% hits
> guix/inferior.scm:392:2: 403 entries, 403 lookups, 0% hits
>
> So, I guess we can drop those two patches.
Looks like it. :-)
Closing!
Thanks,
Ludo’.
--- End Message ---