From: Paul Eggert <eggert@cs.ucla.edu>
To: "Mattias Engdegård" <mattiase@acm.org>
Cc: 35868-done@debbugs.gnu.org
Subject: bug#35868: [PATCH] `memql' does not work for bignums
Date: Thu, 30 May 2019 15:01:19 -0700 [thread overview]
Message-ID: <615e1634-1167-abc2-0f16-2c84274d47ba@cs.ucla.edu> (raw)
In-Reply-To: <79AE2738-3B42-410A-AA9A-F0FDE7865162@acm.org>
[-- Attachment #1: Type: text/plain, Size: 110 bytes --]
Thanks for the bug report and fix. I installed it into master, followed
by the attached performance tweaks.
[-- Attachment #2: 0001-Improve-eq1-memql-performance.patch --]
[-- Type: text/x-patch, Size: 2226 bytes --]
From 24a58620cb8ce4aa11e2428d86e58911e7975aeb Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 30 May 2019 14:57:21 -0700
Subject: [PATCH] Improve eq1/memql performance
* src/fns.c (Fmemql, Feql): Inline to tweak performance.
---
src/fns.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/fns.c b/src/fns.c
index da830a9000..cb47b818f1 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1521,7 +1521,7 @@ DEFUN ("elt", Felt, Selt, 2, 2, 0,
EMACS_UINT word[WORDS_PER_DOUBLE];
};
-/* Return true if X and Y are the same floating-point value.
+/* Return true if the floats X and Y have the same value.
This looks at X's and Y's representation, since (unlike '==')
it returns true if X and Y are the same NaN. */
static bool
@@ -1567,32 +1567,32 @@ DEFUN ("memql", Fmemql, Smemql, 2, 2, 0,
The value is actually the tail of LIST whose car is ELT. */)
(Lisp_Object elt, Lisp_Object list)
{
+ Lisp_Object tail = list;
+
if (FLOATP (elt))
{
- Lisp_Object tail = list;
FOR_EACH_TAIL (tail)
{
Lisp_Object tem = XCAR (tail);
if (FLOATP (tem) && same_float (elt, tem))
return tail;
}
- CHECK_LIST_END (tail, list);
- return Qnil;
}
else if (BIGNUMP (elt))
{
- Lisp_Object tail = list;
FOR_EACH_TAIL (tail)
{
Lisp_Object tem = XCAR (tail);
- if (equal_no_quit (elt, tem))
+ if (BIGNUMP (tem)
+ && mpz_cmp (XBIGNUM (elt)->value, XBIGNUM (tem)->value) == 0)
return tail;
}
- CHECK_LIST_END (tail, list);
- return Qnil;
}
else
return Fmemq (elt, list);
+
+ CHECK_LIST_END (tail, list);
+ return Qnil;
}
DEFUN ("assq", Fassq, Sassq, 2, 2, 0,
@@ -2301,7 +2301,9 @@ DEFUN ("eql", Feql, Seql, 2, 2, 0,
if (FLOATP (obj1))
return FLOATP (obj2) && same_float (obj1, obj2) ? Qt : Qnil;
else if (BIGNUMP (obj1))
- return equal_no_quit (obj1, obj2) ? Qt : Qnil;
+ return ((BIGNUMP (obj2)
+ && mpz_cmp (XBIGNUM (obj1)->value, XBIGNUM (obj2)->value) == 0)
+ ? Qt : Qnil);
else
return EQ (obj1, obj2) ? Qt : Qnil;
}
--
2.21.0
next prev parent reply other threads:[~2019-05-30 22:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 15:07 bug#35868: [PATCH] `memql' does not work for bignums Mattias Engdegård
2019-05-30 22:01 ` Paul Eggert [this message]
2019-06-02 13:12 ` Mattias Engdegård
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=615e1634-1167-abc2-0f16-2c84274d47ba@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=35868-done@debbugs.gnu.org \
--cc=mattiase@acm.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.