From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60953: The :match predicate with large regexp in tree-sitter font-lock seems inefficient Date: Thu, 2 Feb 2023 14:12:54 +0200 Message-ID: References: <7624dddc-4600-9a03-ac8b-d3c9e0ab618c@yandex.ru> <838rhpg57n.fsf@gnu.org> <5026D975-983F-4D18-8690-BE139C92825D@gmail.com> <83pmb1emxi.fsf@gnu.org> <6f318afc-ca71-8b7e-c822-52e6635b5718@yandex.ru> <83sffxcfxw.fsf@gnu.org> <83pmb1cbg5.fsf@gnu.org> <2da844d3-ea31-289e-2821-aa174e365ffd@yandex.ru> <6784f9e7-844b-374d-2a1e-8a61cebe0d7e@yandex.ru> <83zga03yne.fsf@gnu.org> <373a575f-c683-1581-c3e6-502e9897fb04@yandex.ru> <83mt603vrc.fsf@gnu.org> <83e58a1b-2e4a-356a-36d8-c756ff105b62@yandex.ru> <83bkmf52va.fsf@gnu.org> <33cad4c1-4af5-37bb-05bc-79a4d9c1a700@yandex.ru> <83wn533lut.fsf@gnu.org> <19892f55-498e-1109-2229-2ddd984849a4@yandex.ru> <83tu073ksp.fsf@gnu.org> <83sffr2xq2.fsf@gnu.org> <30b047a9-dfe3-948a-a123-2e15221c239d@yandex.ru> <83tu05zeqe.fsf@gnu.org> <957c7e3e-830e-0a03-562f-fdddc6bd1c06@yandex.ru> <835yckzic7.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1UISxF3jfS6GiC00qsvGlSvW" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26166"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: casouri@gmail.com, 60953@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Feb 02 13:14:25 2023 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 1pNYTw-0006cP-FM for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 02 Feb 2023 13:14:24 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNYTe-000783-0g; Thu, 02 Feb 2023 07:14:06 -0500 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 1pNYTb-00077r-HB for bug-gnu-emacs@gnu.org; Thu, 02 Feb 2023 07:14:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNYTa-0001IS-Qo for bug-gnu-emacs@gnu.org; Thu, 02 Feb 2023 07:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNYTa-0003qy-7h for bug-gnu-emacs@gnu.org; Thu, 02 Feb 2023 07:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 02 Feb 2023 12:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60953 X-GNU-PR-Package: emacs Original-Received: via spool by 60953-submit@debbugs.gnu.org id=B60953.167533998514738 (code B ref 60953); Thu, 02 Feb 2023 12:14:02 +0000 Original-Received: (at 60953) by debbugs.gnu.org; 2 Feb 2023 12:13:05 +0000 Original-Received: from localhost ([127.0.0.1]:32779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNYSe-0003pe-FQ for submit@debbugs.gnu.org; Thu, 02 Feb 2023 07:13:04 -0500 Original-Received: from mail-wm1-f49.google.com ([209.85.128.49]:42848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNYSc-0003ow-TZ for 60953@debbugs.gnu.org; Thu, 02 Feb 2023 07:13:03 -0500 Original-Received: by mail-wm1-f49.google.com with SMTP id j29-20020a05600c1c1d00b003dc52fed235so1231594wms.1 for <60953@debbugs.gnu.org>; Thu, 02 Feb 2023 04:13:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:sender:from:to:cc:subject :date:message-id:reply-to; bh=Uk/X+tLx1wLXEzXQNVMJ5v/ig+gG4vumt+aUs+Ju3oM=; b=OQ7CS6iYaH8OWd9CJ4Etx8Ss5bQX7WYPiiS+wGcMTHUE9KYEHWOXKGNDeWOu2IvStA +q9W5WHY1E9WkwKms2krHPRMjU7y1j/QUJKOnVs6AJPiasYEflPYFc71gUJrxD3PXCUy 6Z3+KGSKUc9QxovZcZWRRyyKIIE0Szu+g71M+rlIbwFVQ/L4pCXuwPlCbqdCWYtsWCKD ELQlEUpd5DqmaLT4wBC9l81kmXjLx17TIS4sDvGDI3dBPMnNDIVEaEiqQPuRAHiBI0QW KrDb9y8pTgHb8YndD0TyYfG+Ga5HbI6zuhHBv+00bKS3NICHdOKvNP/jvFleqhcSadhz DDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:sender:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Uk/X+tLx1wLXEzXQNVMJ5v/ig+gG4vumt+aUs+Ju3oM=; b=8AAEGM8CfAU0fvfGIoZkHoT4PYhtR/pLaACr5FPqyk9wINIzg230VBvleeb2eHQm0o bewikXaeuHVffdoTJRprCPztqt2UWxjJ6VAd4jAG5TFLJ/+8hFVNJuXkx+EmMpkrhyF+ xtE/tQicyJMkozgsT8Y8l3lJuR2yTIPP9tOfd6eTXVUruKml3yLxsYo6XKdU8I6uAhQi BsdTczFhrE4T48NN9/lQuzjxzF0ZHDNys+7bOielmo3HJy7s9hi6GPpSo/WUq7EmsjMW 0/V1PpcUcJP6QvxFpggb/6NRSajYZoMSRmTzcZgnr8nMKFWy+7rKQcDqTayA9qmZKcF7 U8Zw== X-Gm-Message-State: AO0yUKWfil1l5HBhSqSnEU6AZrDX5/8WMP1qswgR7D23K/kNE8sqEmiA 2j/D0HGhCbSBON9EHWDVtA8= X-Google-Smtp-Source: AK7set9JsLgIkTXU0rxa3smom2oMHTTirvCyWLvMlXGZ/K0yTc0j7NlRM+6mPOILAtIF9qAG39TJBQ== X-Received: by 2002:a05:600c:35cd:b0:3d3:5319:b6d3 with SMTP id r13-20020a05600c35cd00b003d35319b6d3mr5733764wmq.38.1675339976868; Thu, 02 Feb 2023 04:12:56 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id x9-20020a05600c21c900b003dc434b39c7sm9252253wmj.0.2023.02.02.04.12.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Feb 2023 04:12:55 -0800 (PST) Content-Language: en-US In-Reply-To: <835yckzic7.fsf@gnu.org> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:254647 Archived-At: This is a multi-part message in MIME format. --------------1UISxF3jfS6GiC00qsvGlSvW Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 02/02/2023 08:34, Eli Zaretskii wrote: >> Date: Wed, 1 Feb 2023 23:20:50 +0200 >> Cc:casouri@gmail.com,60953@debbugs.gnu.org >> From: Dmitry Gutov >> >> On 01/02/2023 15:39, Eli Zaretskii wrote: >>>> Please see the attachment. >>>> >>>> To note the numbers: the first patch does quite well to improve the >>>> performance of modes which use :match in queries which match a lot of >>>> nodes (e.g. rust-ts-mode or ruby-ts-mode). There boost in those was on >>>> the order of 25%. >>>> >>>> The second one is longer, and the boost (on top of the first one) is >>>> around 5-6%, stable. Not as impressive, but at least it brings :match's >>>> performance a little above :pred's in my example. >>> Fine by me, if Yuan also approves. >> For emacs-29, right? > Yes. Please take a look at this additional patch on top of the other one. It is ok? I just remembered that if we don't want to auto-anchor the regexp, then 'looking-at' is not the appropriate semantic. So this switches to 'search_buffer'. --------------1UISxF3jfS6GiC00qsvGlSvW Content-Type: text/x-patch; charset=UTF-8; name="treesit_predicate_match_use_search_buffer.diff" Content-Disposition: attachment; filename="treesit_predicate_match_use_search_buffer.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9saXNwLmggYi9zcmMvbGlzcC5oCmluZGV4IDcwNTU1YjNjZTkx Li4xMjc2Mjg1ZTJmMiAxMDA2NDQKLS0tIGEvc3JjL2xpc3AuaAorKysgYi9zcmMvbGlzcC5o CkBAIC00ODAyLDYgKzQ4MDIsOSBAQCBmYXN0X2Nfc3RyaW5nX21hdGNoX2lnbm9yZV9jYXNl IChMaXNwX09iamVjdCByZWdleHAsCiAJCQkJICAgICAgIHB0cmRpZmZfdCwgcHRyZGlmZl90 ICopOwogZXh0ZXJuIHB0cmRpZmZfdCBmaW5kX2JlZm9yZV9uZXh0X25ld2xpbmUgKHB0cmRp ZmZfdCwgcHRyZGlmZl90LAogCQkJCQkgICBwdHJkaWZmX3QsIHB0cmRpZmZfdCAqKTsKK2V4 dGVybiBFTUFDU19JTlQgc2VhcmNoX2J1ZmZlciAoTGlzcF9PYmplY3QsIHB0cmRpZmZfdCwg cHRyZGlmZl90LAorCQkJCXB0cmRpZmZfdCwgcHRyZGlmZl90LCBFTUFDU19JTlQsCisJCQkJ aW50LCBMaXNwX09iamVjdCwgTGlzcF9PYmplY3QsIGJvb2wpOwogZXh0ZXJuIHZvaWQgc3lt c19vZl9zZWFyY2ggKHZvaWQpOwogZXh0ZXJuIHZvaWQgY2xlYXJfcmVnZXhwX2NhY2hlICh2 b2lkKTsKIApkaWZmIC0tZ2l0IGEvc3JjL3NlYXJjaC5jIGIvc3JjL3NlYXJjaC5jCmluZGV4 IGRiYzVhODM5NDZmLi4wYmI1MmMwM2VlZiAxMDA2NDQKLS0tIGEvc3JjL3NlYXJjaC5jCisr KyBiL3NyYy9zZWFyY2guYwpAQCAtNjgsOSArNjgsNiBAQCAjZGVmaW5lIFJFR0VYUF9DQUNI RV9TSVpFIDIwCiBzdGF0aWMgRU1BQ1NfSU5UIGJveWVyX21vb3JlIChFTUFDU19JTlQsIHVu c2lnbmVkIGNoYXIgKiwgcHRyZGlmZl90LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTGlzcF9PYmplY3QsIExpc3BfT2JqZWN0LCBwdHJkaWZmX3QsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwdHJkaWZmX3QsIGludCk7Ci1zdGF0aWMgRU1BQ1NfSU5UIHNl YXJjaF9idWZmZXIgKExpc3BfT2JqZWN0LCBwdHJkaWZmX3QsIHB0cmRpZmZfdCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHRyZGlmZl90LCBwdHJkaWZmX3QsIEVNQUNT X0lOVCwgaW50LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBMaXNwX09iamVj dCwgTGlzcF9PYmplY3QsIGJvb2wpOwogCiBMaXNwX09iamVjdCByZV9tYXRjaF9vYmplY3Q7 CiAKQEAgLTE1MTAsNyArMTUwNyw3IEBAIHNlYXJjaF9idWZmZXJfbm9uX3JlIChMaXNwX09i amVjdCBzdHJpbmcsIHB0cmRpZmZfdCBwb3MsCiAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0 YXRpYyBFTUFDU19JTlQKK0VNQUNTX0lOVAogc2VhcmNoX2J1ZmZlciAoTGlzcF9PYmplY3Qg c3RyaW5nLCBwdHJkaWZmX3QgcG9zLCBwdHJkaWZmX3QgcG9zX2J5dGUsCiAJICAgICAgIHB0 cmRpZmZfdCBsaW0sIHB0cmRpZmZfdCBsaW1fYnl0ZSwgRU1BQ1NfSU5UIG4sCiAJICAgICAg IGludCBSRSwgTGlzcF9PYmplY3QgdHJ0LCBMaXNwX09iamVjdCBpbnZlcnNlX3RydCwgYm9v bCBwb3NpeCkKZGlmZiAtLWdpdCBhL3NyYy90cmVlc2l0LmMgYi9zcmMvdHJlZXNpdC5jCmlu ZGV4IDUxMDE3MGNhNjQwLi4wNjlmYTM2MDhiZCAxMDA2NDQKLS0tIGEvc3JjL3RyZWVzaXQu YworKysgYi9zcmMvdHJlZXNpdC5jCkBAIC0yNDkxLDcgKzI0OTEsOCBAQCB0cmVlc2l0X3By ZWRpY2F0ZV9tYXRjaCAoTGlzcF9PYmplY3QgYXJncywgc3RydWN0IGNhcHR1cmVfcmFuZ2Ug Y2FwdHVyZXMpCiAgIFpWID0gZW5kX3BvczsKICAgWlZfQllURSA9IGVuZF9ieXRlOwogCi0g IHB0cmRpZmZfdCB2YWwgPSBmYXN0X2xvb2tpbmdfYXQgKHJlZ2V4cCwgc3RhcnRfcG9zLCBz dGFydF9ieXRlLCBlbmRfcG9zLCBlbmRfYnl0ZSwgUW5pbCk7CisgIHB0cmRpZmZfdCB2YWwg PSBzZWFyY2hfYnVmZmVyIChyZWdleHAsIHN0YXJ0X3Bvcywgc3RhcnRfYnl0ZSwgZW5kX3Bv cywgZW5kX2J5dGUsCisJCQkJIDEsIDEsIFFuaWwsIFFuaWwsIGZhbHNlKTsKIAogICBCRUdW ID0gb2xkX2JlZ3Y7CiAgIEJFR1ZfQllURSA9IG9sZF9iZWd2X2J5dGU7Cg== --------------1UISxF3jfS6GiC00qsvGlSvW--