From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Mingrone Newsgroups: gmane.emacs.devel Subject: Re: master 52b67740d10: Generalise a LAP optimisation rule Date: Mon, 03 Apr 2023 14:41:28 -0300 Message-ID: <86ttxw3ltj.fsf@phe.ftfl.ca> References: <167976134206.19776.1825822435181145052@vcs2.savannah.gnu.org> <20230325162222.64223C1391B@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11882"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Mattias =?utf-8?Q?Engdeg=C3=A5rd?= , emacs@FreeBSD.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Apr 03 19:42:56 2023 Return-path: Envelope-to: ged-emacs-devel@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 1pjOCk-0002ph-CF for ged-emacs-devel@m.gmane-mx.org; Mon, 03 Apr 2023 19:42:54 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjOBf-0005Ty-Db; Mon, 03 Apr 2023 13:41:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjOBb-0005Ti-AP for emacs-devel@gnu.org; Mon, 03 Apr 2023 13:41:43 -0400 Original-Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjOBY-0005ld-Fp for emacs-devel@gnu.org; Mon, 03 Apr 2023 13:41:42 -0400 Original-Received: by mail-qt1-x836.google.com with SMTP id t19so29104408qta.12 for ; Mon, 03 Apr 2023 10:41:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ftfl.ca; s=google; t=1680543690; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vcLGyEwHoRN4/aNbEzkyjI8pE87EA4Oq9dPg6MhEyDk=; b=T9rHblC/Y4Z5XJJpIIxAhxOPVTTj67mCROtCyd9jzfOOLJy5LnjJRr4KF7XlkDFm7m wjcJwzlwRih2X94qx3Y2ySMQEdUjcxy0IRn1d1wptomrKoKhNl3fVHgRbqi/oSrsRojg QNuEtzTSHjkOYBGEo9V08x/GuT8g+cTcARs+o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680543690; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vcLGyEwHoRN4/aNbEzkyjI8pE87EA4Oq9dPg6MhEyDk=; b=4Lz0VVGAHEFeyNzhHieNqnMNEQhHtBP56mxq3LKwylPlfIHD0FYFzPIcPegoFYpFyb POrkm2niy8ALrBz/3HLNFPEl5Tcl5HxU1nJ23IM/3Y8WBpItmJhz55GF1qiuWt7NY4Qg WXXm6iXHWh6c+xSKYPukJdXqMLmOyjNLDeXjZB/MjZauiIZZSDOEE5eWp7Y3PpyQDjgA fjz6xrkEzS0KKVHrfSye0iygnX0bLo2GpFIoDWqvZ2hp7Q+ibwkjUeumqLm2HNB4h6vE NcWG3mbJJ/z3pKpC04mMBDu7oXXMdeCHbvGN2/uYqKvI+cUYTFiT6FT7/KHXt+s8KXEm cW6Q== X-Gm-Message-State: AO0yUKVvOk2vTx9anZB7QYbtijWCBqU+ioTVz3nn34ylTwONhST86PTc MOF65ClG5i5/30qo+pQIQL0ECA== X-Google-Smtp-Source: AKy350ZogtRRlN5kkCIe9FQlXY2mGmrilDZgRd/36vcJNqUNmO70yqHEtdHNGc019nh4GrwSD+5/4w== X-Received: by 2002:a05:622a:1a98:b0:3dc:a4e5:aef0 with SMTP id s24-20020a05622a1a9800b003dca4e5aef0mr57952592qtc.9.1680543690452; Mon, 03 Apr 2023 10:41:30 -0700 (PDT) Original-Received: from phe.ftfl.ca.ftfl.ca (drmons0544w-156-34-187-123.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.187.123]) by smtp.gmail.com with ESMTPSA id x23-20020a05620a0b5700b00746b79101b6sm2911427qkg.67.2023.04.03.10.41.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 10:41:30 -0700 (PDT) In-Reply-To: <20230325162222.64223C1391B@vcs2.savannah.gnu.org> ("Mattias =?utf-8?Q?Engdeg=C3=83=C2=A5rd=22's?= message of "Sat, 25 Mar 2023 12:22:22 -0400 (EDT)") Received-SPF: pass client-ip=2607:f8b0:4864:20::836; envelope-from=jrm@ftfl.ca; helo=mail-qt1-x836.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:305080 Archived-At: On Sat, 2023-03-25 at 12:22, Mattias Engdeg=C3=83=C2=A5rd wrote: > branch: master > commit 52b67740d10df8ca539fdc2c7d50283997683141 > Author: Mattias Engdeg=C3=A5rd > Commit: Mattias Engdeg=C3=A5rd > Generalise a LAP optimisation rule > * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): > Accept (stack-set 1) as equivalent to (discardN-preserve-tos 1) in a > rule previously overlooked. This is usually beneficial in code size > and almost always shortens dynamic paths. > --- > lisp/emacs-lisp/byte-opt.el | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el > index 3c7aeb89525..0891ec80beb 100644 > --- a/lisp/emacs-lisp/byte-opt.el > +++ b/lisp/emacs-lisp/byte-opt.el > @@ -2765,7 +2765,9 @@ If FOR-EFFECT is non-nil, the return value is assum= ed to be of no importance." > (or (memq (caar tmp) '(byte-discard byte-discardN)) > ;; Make sure we don't hoist a discardN-preserv= e-tos > ;; that really should be merged or deleted ins= tead. > - (and (eq (caar tmp) 'byte-discardN-preserve-to= s) > + (and (or (eq (caar tmp) 'byte-discardN-preserv= e-tos) > + (and (eq (caar tmp) 'byte-stack-set) > + (eql (cdar tmp) 1))) > (let ((next (cadr tmp))) > (not (or (memq (car next) > '(byte-discardN-preserve= -tos Hello, This commit causes native compilation builds on FreeBSD to fail with the er= ror native-ice ("org/org-plot.el" "block does not end with a branch"... The full error is below and a link to a complete build log (FreeBSD package build) is also included. When the commit is reverted, the build finishes successfully again. Joe -l comp -f batch-byte+native-compile org/org-protocol.el Internal native compiler error: "org/org-plot.el", "block does not end with= a branch", #s(comp-block-lap bb_8 ((comment "LAP TAG 83") (call helper_unb= ind_n #s(comp-mvar nil nil ((1 . 1)) nil nil nil)) (setimm #s(comp-mvar (t)= nil nil nil nil 2) make-temp-file) (setimm #s(comp-mvar (t) nil nil nil ni= l 3) "org-plot") (set #s(comp-mvar (t) nil nil nil nil 2) (callref funcall = #s(comp-mvar (t) nil nil nil nil 2) #s(comp-mvar (t) nil nil nil nil 3))) (= call record_unwind_protect_excursion) (setimm #s(comp-mvar (t) nil nil nil = nil 3) org-plot/goto-nearest-table) (set #s(comp-mvar (t) nil nil nil nil 3= ) (callref funcall #s(comp-mvar (t) nil nil nil nil 3))) (setimm #s(comp-mv= ar (t) nil nil nil nil 3) org-table-to-lisp) (set #s(comp-mvar (t) nil nil = nil nil 3) (callref funcall #s(comp-mvar (t) nil nil nil nil 3))) ...) nil = nil nil nil #s(hash-table size 65 test eql rehash-size 1.5 rehash-threshold= 0.8125 data ()) nil nil ...), # Error: native-ice ("org/org-plot.el" "block does not end with a branch" #s(= comp-block-lap bb_8 ((comment "LAP TAG 83") (call helper_unbind_n #s(comp-m= var nil nil ((1 . 1)) nil nil nil)) (setimm #s(comp-mvar (t) nil nil nil ni= l 2) make-temp-file) (setimm #s(comp-mvar (t) nil nil nil nil 3) "org-plot"= ) (set #s(comp-mvar (t) nil nil nil nil 2) (callref funcall #s(comp-mvar (t= ) nil nil nil nil 2) #s(comp-mvar (t) nil nil nil nil 3))) (call record_unw= ind_protect_excursion) (setimm #s(comp-mvar (t) nil nil nil nil 3) org-plot= /goto-nearest-table) (set #s(comp-mvar (t) nil nil nil nil 3) (callref func= all #s(comp-mvar (t) nil nil nil nil 3))) (setimm #s(comp-mvar (t) nil nil = nil nil 3) org-table-to-lisp) (set #s(comp-mvar (t) nil nil nil nil 3) (cal= lref funcall #s(comp-mvar (t) nil nil nil nil 3))) (call helper_unbind_n #s= (comp-mvar nil nil ((1 . 1)) nil nil nil)) (setimm #s(comp-mvar (t) nil nil= nil nil 4) plist-get) (set #s(comp-mvar (t) nil nil nil nil 5) #s(comp-mva= r (t) nil nil nil nil 0)) (setimm #s(comp-mvar (t) nil nil nil nil 6) :tran= spose) (set #s(comp-mvar (t) nil nil nil nil 4) (callref funcall #s(comp-mv= ar (t) nil nil nil nil 4) #s(comp-mvar (t) nil nil nil nil 5) #s(comp-mvar = (t) nil nil nil nil 6))) (set #s(comp-mvar (t) nil nil nil nil 5) #s(comp-m= var (t) nil nil nil nil 4)) (setimm #s(comp-mvar (t) nil nil nil nil 6) #s(= hash-table size 3 test eq rehash-size 1.5 rehash-threshold 0.8125 purecopy = t data (y 105 yes 105 t 105)))) nil nil nil nil #s(hash-table size 65 test = eql rehash-size 1.5 rehash-threshold 0.8125 data ()) nil nil 1 72 nil nil) = org-plot/gnuplot) mapbacktrace(#f(compiled-function (evald func args flags) #)) debug-early-backtrace() debug-early(error (native-ice "org/org-plot.el" "block does not end with = a branch" #s(comp-block-lap :name bb_8 :insns ((comment "LAP TAG 83") (call= helper_unbind_n #s(comp-mvar :typeset nil :valset nil :range ((1 . 1)) :ne= g nil :id nil :slot nil)) (setimm #s(comp-mvar :typeset (t) :valset nil :ra= nge nil :neg nil :id nil :slot 2) make-temp-file) (setimm #s(comp-mvar :typ= eset (t) :valset nil :range nil :neg nil :id nil :slot 3) "org-plot") (set = #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :slot 2) = (callref funcall #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil = :id nil :slot 2) #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil = :id nil :slot 3))) (call record_unwind_protect_excursion) (setimm #s(comp-m= var :typeset (t) :valset nil :range nil :neg nil :id nil :slot 3) org-plot/= goto-nearest-table) (set #s(comp-mvar :typeset (t) :valset nil :range nil := neg nil :id nil :slot 3) (callref funcall #s(comp-mvar :typeset (t) :valset= nil :range nil :neg nil :id nil :slot 3))) (setimm #s(comp-mvar :typeset (= t) :valset nil :range nil :neg nil :id nil :slot 3) org-table-to-lisp) (set= #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :slot 3)= (callref funcall #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil= :id nil :slot 3))) (call helper_unbind_n #s(comp-mvar :typeset nil :valset= nil :range ((1 . 1)) :neg nil :id nil :slot nil)) (setimm #s(comp-mvar :ty= peset (t) :valset nil :range nil :neg nil :id nil :slot 4) plist-get) (set = #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :slot 5) = #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :slot 0))= (setimm #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil = :slot 6) :transpose) (set #s(comp-mvar :typeset (t) :valset nil :range nil = :neg nil :id nil :slot 4) (callref funcall #s(comp-mvar :typeset (t) :valse= t nil :range nil :neg nil :id nil :slot 4) #s(comp-mvar :typeset (t) :valse= t nil :range nil :neg nil :id nil :slot 5) #s(comp-mvar :typeset (t) :valse= t nil :range nil :neg nil :id nil :slot 6))) (set #s(comp-mvar :typeset (t)= :valset nil :range nil :neg nil :id nil :slot 5) #s(comp-mvar :typeset (t)= :valset nil :range nil :neg nil :id nil :slot 4)) (setimm #s(comp-mvar :ty= peset (t) :valset nil :range nil :neg nil :id nil :slot 6) #)) :closed nil :in-edges nil :out-edges nil :idom nil :df #= :post-num nil :final-frame nil :sp 1 :add= r 72 :non-ret-insn nil :no-ret nil) org-plot/gnuplot)) signal(native-ice ("org/org-plot.el" "block does not end with a branch" #= s(comp-block-lap :name bb_8 :insns ((comment "LAP TAG 83") (call helper_unb= ind_n #s(comp-mvar :typeset nil :valset nil :range ((1 . 1)) :neg nil :id n= il :slot nil)) (setimm #s(comp-mvar :typeset (t) :valset nil :range nil :ne= g nil :id nil :slot 2) make-temp-file) (setimm #s(comp-mvar :typeset (t) :v= alset nil :range nil :neg nil :id nil :slot 3) "org-plot") (set #s(comp-mva= r :typeset (t) :valset nil :range nil :neg nil :id nil :slot 2) (callref fu= ncall #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :sl= ot 2) #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :sl= ot 3))) (call record_unwind_protect_excursion) (setimm #s(comp-mvar :typese= t (t) :valset nil :range nil :neg nil :id nil :slot 3) org-plot/goto-neares= t-table) (set #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id= nil :slot 3) (callref funcall #s(comp-mvar :typeset (t) :valset nil :range= nil :neg nil :id nil :slot 3))) (setimm #s(comp-mvar :typeset (t) :valset = nil :range nil :neg nil :id nil :slot 3) org-table-to-lisp) (set #s(comp-mv= ar :typeset (t) :valset nil :range nil :neg nil :id nil :slot 3) (callref f= uncall #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :s= lot 3))) (call helper_unbind_n #s(comp-mvar :typeset nil :valset nil :range= ((1 . 1)) :neg nil :id nil :slot nil)) (setimm #s(comp-mvar :typeset (t) := valset nil :range nil :neg nil :id nil :slot 4) plist-get) (set #s(comp-mva= r :typeset (t) :valset nil :range nil :neg nil :id nil :slot 5) #s(comp-mva= r :typeset (t) :valset nil :range nil :neg nil :id nil :slot 0)) (setimm #s= (comp-mvar :typeset (t) :valset nil :range nil :neg nil :id nil :slot 6) :t= ranspose) (set #s(comp-mvar :typeset (t) :valset nil :range nil :neg nil :i= d nil :slot 4) (callref funcall #s(comp-mvar :typeset (t) :valset nil :rang= e nil :neg nil :id nil :slot 4) #s(comp-mvar :typeset (t) :valset nil :rang= e nil :neg nil :id nil :slot 5) #s(comp-mvar :typeset (t) :valset nil :rang= e nil :neg nil :id nil :slot 6))) (set #s(comp-mvar :typeset (t) :valset ni= l :range nil :neg nil :id nil :slot 5) #s(comp-mvar :typeset (t) :valset ni= l :range nil :neg nil :id nil :slot 4)) (setimm #s(comp-mvar :typeset (t) := valset nil :range nil :neg nil :id nil :slot 6) #)) :closed nil :in-edges nil :out-edges nil :idom nil :df # :post-num nil :final-frame nil :sp 1 :addr 72 :non-r= et-insn nil :no-ret nil) org-plot/gnuplot)) comp--native-compile("org/org-plot.el") batch-native-compile() batch-byte+native-compile() command-line-1(("--eval" "(setq load-prefer-newer t byte-compile-warnings= 'all)" "-l" "comp" "-f" "batch-byte+native-compile" "org/org-plot.el")) command-line() normal-top-level() Full FreeBSD package build: http://pkg.ftfl.ca/data/14amd64-default/2023-04= -03_09h10m05s/logs/errors/emacs-devel-30.0.50.20230403,3.log