From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.bugs Subject: bug#48261: 28.0.50; Optimize `eql' to `eq' for fixnums Date: Thu, 06 May 2021 19:20:10 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38066"; mail-complaints-to="usenet@ciao.gmane.io" To: 48261@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu May 06 19:28:05 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lehnA-0009lx-TF for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 19:28:05 +0200 Original-Received: from localhost ([::1]:57216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lehn9-0000N4-Ty for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 13:28:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lehgR-00039M-Lt for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 13:21:08 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:55360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lehgM-0005Zs-Ok for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 13:21:06 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lehgM-0005gF-Hw for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 13:21:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 06 May 2021 17:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48261 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.162032162121801 (code B ref -1); Thu, 06 May 2021 17:21:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 May 2021 17:20:21 +0000 Original-Received: from localhost ([127.0.0.1]:38671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lehfh-0005fZ-0h for submit@debbugs.gnu.org; Thu, 06 May 2021 13:20:21 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:44014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lehff-0005fT-3o for submit@debbugs.gnu.org; Thu, 06 May 2021 13:20:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lehfe-0002Te-Qu for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 13:20:18 -0400 Original-Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:35707) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lehfb-00055G-DB for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 13:20:17 -0400 Original-Received: by mail-ed1-x534.google.com with SMTP id di13so7075955edb.2 for ; Thu, 06 May 2021 10:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=Zm6l+HCyVM5w4WiHUhtUVj9azMmB/iHmsHbxLmnWdk8=; b=D+m6BLY2SV/3SUOZjziTRaETG3I0ZYOsl+b1KXrHWyL5QFKeshTMBFvI9QCBc5LtNG +2OqoYn0UIAcN7IIs42q4Z1KI+3DZi+pumqAd2oUDD6TOZHo5J3pXxjYLUo4JNjvgZL0 VvE6HHp8oL8pCmOrsw0Q5zHRH6/+k1LcY6k69x2+Bhvxnb1i8cQzp8wnl5brKGDfn9L8 La0qrbtnOLEvexO7OOqkFVXIymjP6IcASwOsbwo4A+5nyJlo6UIlna9aRCNnRp0XwZ7J F1Uy+DaAerAoRWz2r7uqRjzt4tMutKgd8sokoF6dkpVUJAukVSFjH0KDRgQ+cy/SkS2F RHmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=Zm6l+HCyVM5w4WiHUhtUVj9azMmB/iHmsHbxLmnWdk8=; b=FK4kF5MpNn1u6f3wTX+OzJ+j2PlNxiJbdzGoyiXt5GJy+eAGtz8C8fQD6ERSNrV1Xj B5cJUxcQA3SLs2K97vwdSuzWVem5DGmb7UNI7naHU1n+XGeYLaPl8oZXobKQYvtNE3a1 cKcFlBgZz8fxdz5k9WZLxSvFd8xI8GKgMBVmH45cQKB8yjKJuZf00XM4ueRpbJemEzRi /k01/DThWhGwMX9+v+Fk64ZFsugZLHezzR7eoJaRJaxm7+vGBFQ4Y5RpH98JFbBAcmW/ fludPO3QNhktwHfgBTkxJ3NMcYJBAjRa0Ecde43RGYJmjRXyrbHnEjI6lp4tcsb9kdLN U/kw== X-Gm-Message-State: AOAM530nIX3X4MuwUlp7+EgDQ1cBf7n2hDZxAkRr5TDCBrCy0xr91cyj A/S8+OCRWNoorB8UGTrrHJR9RchbDI4= X-Google-Smtp-Source: ABdhPJy/Wv6YszJso6Bu7HdYYeM/oFtqPPznZbdQCq7ndOlf2BYXBejrfazE2nqgC/pJHbOYdb1R+w== X-Received: by 2002:a50:a446:: with SMTP id v6mr3630185edb.254.1620321612766; Thu, 06 May 2021 10:20:12 -0700 (PDT) Original-Received: from phst (p579974f2.dip0.t-ipconnect.de. [87.153.116.242]) by smtp.gmail.com with ESMTPSA id y25sm1901741ejb.34.2021.05.06.10.20.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 10:20:12 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=p.stephani2@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:205865 Archived-At: --=-=-= Content-Type: text/plain It would be nice if the byte optimizer could optimize `eql' to `eq' if one of the arguments is guaranteed to be a fixnum. Patch is attached. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Optimize-calls-to-eql-memql-and-similar-for-fixnums.patch Content-Description: patch >From 8b6f76df20454bb0caaba71cac9c5c3a7cb2aa62 Mon Sep 17 00:00:00 2001 From: Philipp Stephani Date: Thu, 6 May 2021 19:13:00 +0200 Subject: [PATCH] Optimize calls to 'eql', 'memql' and similar for fixnums. It's good practice to compare integers using 'eql' because two bignum objects representing the same integer might not be 'eq'. However, 'eql' is slower and doesn't have its own byte code. Therefore, replace it with 'eq' if one argument is guaranteed to be a fixnum on all platforms. * lisp/emacs-lisp/byte-opt.el (byte-optimize--fixnump): New helper function. (byte-optimize-equal, byte-optimize-member, byte-optimize-assoc): Use it to optimize 'eql' etc. to 'eq' if it will always compare fixnums. --- lisp/emacs-lisp/byte-opt.el | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 33b4d4b3c8..4dd8b90b3a 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -951,12 +951,20 @@ byte-optimize--constant-symbol-p "Whether EXPR is a constant symbol." (and (macroexp-const-p expr) (symbolp (eval expr)))) +(defun byte-optimize--fixnump (o) + "Return whether O is guaranteed to be a fixnum in all Emacsen. +See Info node `(elisp) Integer Basics'." + (and (fixnump o) (<= -536870912 o 536870911))) + (defun byte-optimize-equal (form) - ;; Replace `equal' or `eql' with `eq' if at least one arg is a symbol. + ;; Replace `equal' or `eql' with `eq' if at least one arg is a + ;; symbol or fixnum. (byte-optimize-binary-predicate (if (= (length (cdr form)) 2) (if (or (byte-optimize--constant-symbol-p (nth 1 form)) - (byte-optimize--constant-symbol-p (nth 2 form))) + (byte-optimize--constant-symbol-p (nth 2 form)) + (byte-optimize--fixnump (nth 1 form)) + (byte-optimize--fixnump (nth 2 form))) (cons 'eq (cdr form)) form) ;; Arity errors reported elsewhere. @@ -964,14 +972,18 @@ byte-optimize-equal (defun byte-optimize-member (form) ;; Replace `member' or `memql' with `memq' if the first arg is a symbol, - ;; or the second arg is a list of symbols. + ;; or the second arg is a list of symbols. Same with fixnums. (if (= (length (cdr form)) 2) (if (or (byte-optimize--constant-symbol-p (nth 1 form)) + (byte-optimize--fixnump (nth 1 form)) (let ((arg2 (nth 2 form))) (and (macroexp-const-p arg2) (let ((listval (eval arg2))) (and (listp listval) - (not (memq nil (mapcar #'symbolp listval)))))))) + (cl-every + (lambda (o) + (or (symbolp o) (byte-optimize--fixnump o))) + listval)))))) (cons 'memq (cdr form)) form) ;; Arity errors reported elsewhere. @@ -979,11 +991,12 @@ byte-optimize-member (defun byte-optimize-assoc (form) ;; Replace 2-argument `assoc' with `assq', `rassoc' with `rassq', - ;; if the first arg is a symbol. + ;; if the first arg is a symbol or fixnum. (cond ((/= (length form) 3) form) - ((byte-optimize--constant-symbol-p (nth 1 form)) + ((or (byte-optimize--constant-symbol-p (nth 1 form)) + (byte-optimize--fixnump (nth 1 form))) (cons (if (eq (car form) 'assoc) 'assq 'rassq) (cdr form))) (t (byte-optimize-constant-args form)))) -- 2.31.1.607.g51e8a6a459-goog --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable In GNU Emacs 28.0.50 (build 95, x86_64-pc-linux-gnu, GTK+ Version 3.24.24, = cairo version 1.16.0) of 2021-05-06 Repository revision: 8b7495a722a57071cb2a978665f95f8227db2863 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12010000 System Description: Debian GNU/Linux rodete Configured using: 'configure --enable-gcc-warnings=3Dwarn-only --enable-gtk-deprecation-warnings --without-pop --with-mailutils --enable-checking=3Dall --enable-check-lisp-object-type --with-modules 'CFLAGS=3D-O0 -ggdb3'' Configured features: CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON LIBSELINUX LIBSYSTEMD MODULES NOTIFY INOTIFY PDUMPER PNG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM GTK3 ZLIB Important settings: value of $LC_TIME: en_DK.utf8 value of $LANG: en_US.utf8 value of $XMODIFIERS: @im=3Dibus locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message rmc dired dired-loaddefs rfc822 mml mml-sec epa epg epg-config gnus-util rmail rmail-loaddefs time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils phst skeleton derived edmacro kmacro pcase ffap thingatpt url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json map url-vars mailcap rx gnutls puny dbus xml subr-x seq byte-opt gv bytecomp byte-compile cconv compile text-property-search comint ansi-color ring cl-loaddefs cl-lib iso-transl tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice button loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote threads dbusbind inotify dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 69305 6969) (symbols 48 8421 3) (strings 32 24389 2023) (string-bytes 1 789279) (vectors 16 15076) (vector-slots 8 195751 5867) (floats 8 26 32) (intervals 56 223 0) (buffers 992 11)) --=20 Google Germany GmbH Erika-Mann-Stra=C3=9Fe 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Falls Sie diese f=C3=A4lschlicherweise erhal= ten haben sollten, leiten Sie diese bitte nicht an jemand anderes weiter, l=C3=B6sche= n Sie alle Kopien und Anh=C3=A4nge davon und lassen Sie mich bitte wissen, dass d= ie E-Mail an die falsche Person gesendet wurde. This e-mail is confidential. If you received this communication by mistake, please don=E2=80=99t forward it to anyone else, please erase all copies and attachments, and please let me know that it has gone to the wrong person. --=-=-=--