From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 9E529F415E5; Tue, 18 Feb 2025 17:14:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9E529F415E5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1739888076; bh=Q7WjPito+cKieFzcW2UJIZc1Ua+562Y0OmM8Q1vYz1w=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=x6E00z7MCZxYYl9Zch/8Q5NnI1xpLBJUuVJVHDR95bZf7Q2bTLhclQXgIckmGsJV5 906bkMsgrK7qY9XDlejt7xmI78FSqWKe0f3hzGq3OwjwYCEZmUATx1h5H9Gap8TRPH zIJ+XGN1ngP26tzI7k5gvb/5saFAmfSaC+8cBD9s= Received: from send173.i.mail.ru (send173.i.mail.ru [95.163.59.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C987B6D60B0 for ; Tue, 18 Feb 2025 17:14:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C987B6D60B0 Received: by exim-smtp-844687bc8-9h7jx with esmtpa (envelope-from ) id 1tkOMr-000000003l2-2qbm; Tue, 18 Feb 2025 17:14:34 +0300 Content-Type: multipart/alternative; boundary="------------QGagX0fNyg8ePcZtvXSVdPht" Message-ID: <434b0aea-e133-46f2-84fe-034e080dbe98@tarantool.org> Date: Tue, 18 Feb 2025 17:14:32 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org References: <4defed95d90fee0536d841337b134220d493823e.1739444510.git.sergeyb@tarantool.org> In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD916C41472748AFA04BC6EC4D9B4475EA3A2EBA8C4D08F9F5A00894C459B0CD1B95A70989754721B7AA6D5EE0DB6E1EC8DD3BC9EAC9B3E85BDF59949ACCC2D9DF3EDD16E8EE75FCBE4 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE745C0EDBD94D46193EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637C3BF94FB392044A18638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D81B9E1155FE578BA27661185209A7649288B740866DD1F0D1CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F924B32C592EA89F389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C65B78C30F681404D9735652A29929C6C4AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3A34FB461F64EA2D5BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE758ECEFFC28DC0EE1731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5FB02FE36B276BA215002B1117B3ED696FD91683126BB363E33EE06AFCD964888823CB91A9FED034534781492E4B8EEADB71243024C627CEABDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF159568E35F17C124E0EF0E49BE59A646E07920F227ED51CBD56473EEDF0C0AE89B17B6A7F8D99C9B0526A8B1FD8BF66B5BA53676E881F47B9D720E8ECFC377554036DD5C1DAB71F25F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVWiyXSWEEqdrmUbdK4Kehts= X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458A975D0A0F8FE56AA20C74B26AAFF93452C0739E82D4ADE145EC451B1D747C070645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 5/7] ci: add workflow with disabled profilers X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This is a multi-part message in MIME format. --------------QGagX0fNyg8ePcZtvXSVdPht Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, Sergey, thanks for review! On 18.02.2025 15:10, Sergey Kaplun via Tarantool-patches wrote: > Hi, Sergey! > Thanks for the patch! > LGTM, with a minor nits below. > > On 13.02.25, Sergey Bronnikov wrote: >> Needed for the following commit. >> --- >> .github/workflows/exotic-builds-testing.yml | 6 +++++- >> test/tarantool-tests/CMakeLists.txt | 4 ++++ >> .../gh-5994-memprof-human-readable.test.lua | 1 + >> .../profilers/misclib-memprof-lapi.test.lua | 15 ++++++++------- > I suggest to split this commit into 2 separate (both of them are LGTM > though): > 1) Introduce `LUAJIT_DISABLE_MEMPROF` flag in cmake and tests. > 2) Add the corresponding exotic workflow. Separated to commits:  -   ci: add workflow with disabled profilers  -   test: introduce flag LUAJIT_DISABLE_MEMPROF > >> 4 files changed, 18 insertions(+), 8 deletions(-) >> >> diff --git a/.github/workflows/exotic-builds-testing.yml b/.github/workflows/exotic-builds-testing.yml >> index 374c879b..70b55423 100644 >> --- a/.github/workflows/exotic-builds-testing.yml >> +++ b/.github/workflows/exotic-builds-testing.yml >> @@ -34,7 +34,7 @@ jobs: >> BUILDTYPE: [Debug, Release] >> ARCH: [ARM64, x86_64] >> GC64: [ON, OFF] >> - FLAVOR: [checkhook, dualnum, dynamic, gdbjit, nojit, nounwind, tablebump] >> + FLAVOR: [checkhook, dualnum, dynamic, gdbjit, nojit, nounwind, tablebump, noprof] > Please sort entries alphabetically. > Here and below. Fixed. > >> include: >> - BUILDTYPE: Debug >> CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug -DLUA_USE_ASSERT=ON -DLUA_USE_APICHECK=ON >> @@ -54,6 +54,8 @@ jobs: >> FLAVORFLAGS: -DLUAJIT_NO_UNWIND=ON >> - FLAVOR: tablebump >> FLAVORFLAGS: -DLUAJIT_ENABLE_TABLE_BUMP=ON >> + - FLAVOR: noprof >> + FLAVORFLAGS: -DLUAJIT_DISABLE_MEMPROF=ON -DLUAJIT_DISABLE_SYSPROF=ON >> exclude: >> - ARCH: ARM64 >> GC64: OFF >> @@ -72,6 +74,8 @@ jobs: >> # (`DASM_S_RANGE_I`). >> - FLAVOR: tablebump >> ARCH: ARM64 >> + - FLAVOR: noprof >> + ARCH: ARM64 >> runs-on: [self-hosted, regular, Linux, '${{ matrix.ARCH }}'] >> name: > >> LuaJIT ${{ matrix.FLAVOR }} >> diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt >> index 9bacac88..a6d09dc7 100644 >> --- a/test/tarantool-tests/CMakeLists.txt >> +++ b/test/tarantool-tests/CMakeLists.txt > > >> index f3041779..0ab9c57c 100644 >> --- a/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua >> +++ b/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua >> @@ -7,6 +7,7 @@ local test = tap.test('gh-5994-memprof-human-readable'):skipcond({ >> ['No profile tools CLI option integration'] = _TARANTOOL, >> -- See alsohttps://github.com/LuaJIT/LuaJIT/issues/606. >> ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'), >> + ["Memprof is disabled"] = os.getenv('LUAJIT_DISABLE_MEMPROF'), > Please use single quotes for this file (for the consistency). Fixed, thanks. >> }) >> >> local utils = require('utils') >> diff --git a/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua >> index ce41e4d5..33925c7f 100644 >> --- a/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua >> +++ b/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua >> @@ -8,6 +8,7 @@ local test = tap.test("misc-memprof-lapi"):skipcond({ >> jit.arch ~= "x64", >> -- See alsohttps://github.com/LuaJIT/LuaJIT/issues/606. >> ["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"), >> + ["Memprof is disabled"] = os.getenv('LUAJIT_DISABLE_MEMPROF'), > Please use dougle quotes for this file (for the consistency). Fixed. > >> }) >> > > >> -- >> 2.34.1 >> --------------QGagX0fNyg8ePcZtvXSVdPht Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Hi, Sergey,

thanks for review!

On 18.02.2025 15:10, Sergey Kaplun via Tarantool-patches wrote:
Hi, Sergey!
Thanks for the patch!
LGTM, with a minor nits below.

On 13.02.25, Sergey Bronnikov wrote:

Needed for the following commit.
---
 .github/workflows/exotic-builds-testing.yml       |  6 +++++-
 test/tarantool-tests/CMakeLists.txt               |  4 ++++
 .../gh-5994-memprof-human-readable.test.lua       |  1 +
 .../profilers/misclib-memprof-lapi.test.lua       | 15 ++++++++-------

I suggest to split this commit into 2 separate (both of them are LGTM
though):
1) Introduce `LUAJIT_DISABLE_MEMPROF` flag in cmake and tests.
2) Add the corresponding exotic workflow.

Separated to commits:

 -   ci: add workflow with disabled profilers
 -   test: introduce flag LUAJIT_DISABLE_MEMPROF



 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/exotic-builds-testing.yml b/.github/workflows/exotic-builds-testing.yml
index 374c879b..70b55423 100644
--- a/.github/workflows/exotic-builds-testing.yml
+++ b/.github/workflows/exotic-builds-testing.yml
@@ -34,7 +34,7 @@ jobs:
         BUILDTYPE: [Debug, Release]
         ARCH: [ARM64, x86_64]
         GC64: [ON, OFF]
-        FLAVOR: [checkhook, dualnum, dynamic, gdbjit, nojit, nounwind, tablebump]
+        FLAVOR: [checkhook, dualnum, dynamic, gdbjit, nojit, nounwind, tablebump, noprof]

Please sort entries alphabetically.
Here and below.
Fixed.


         include:
           - BUILDTYPE: Debug
             CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug -DLUA_USE_ASSERT=ON -DLUA_USE_APICHECK=ON
@@ -54,6 +54,8 @@ jobs:
             FLAVORFLAGS: -DLUAJIT_NO_UNWIND=ON
           - FLAVOR: tablebump
             FLAVORFLAGS: -DLUAJIT_ENABLE_TABLE_BUMP=ON
+          - FLAVOR: noprof
+            FLAVORFLAGS: -DLUAJIT_DISABLE_MEMPROF=ON -DLUAJIT_DISABLE_SYSPROF=ON
         exclude:
           - ARCH: ARM64
             GC64: OFF
@@ -72,6 +74,8 @@ jobs:
           # (`DASM_S_RANGE_I`).
           - FLAVOR: tablebump
             ARCH: ARM64
+          - FLAVOR: noprof
+            ARCH: ARM64
     runs-on: [self-hosted, regular, Linux, '${{ matrix.ARCH }}']
     name: >
       LuaJIT ${{ matrix.FLAVOR }}
diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt
index 9bacac88..a6d09dc7 100644
--- a/test/tarantool-tests/CMakeLists.txt
+++ b/test/tarantool-tests/CMakeLists.txt

<snipped>


index f3041779..0ab9c57c 100644
--- a/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua
+++ b/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua
@@ -7,6 +7,7 @@ local test = tap.test('gh-5994-memprof-human-readable'):skipcond({
   ['No profile tools CLI option integration'] = _TARANTOOL,
   -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
   ['Disabled due to LuaJIT/LuaJIT#606'] = os.getenv('LUAJIT_TABLE_BUMP'),
+  ["Memprof is disabled"] = os.getenv('LUAJIT_DISABLE_MEMPROF'),

Please use single quotes for this file (for the consistency).

Fixed, thanks.



      

        
 })
 
 local utils = require('utils')
diff --git a/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua b/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua
index ce41e4d5..33925c7f 100644
--- a/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua
+++ b/test/tarantool-tests/profilers/misclib-memprof-lapi.test.lua
@@ -8,6 +8,7 @@ local test = tap.test("misc-memprof-lapi"):skipcond({
                                                jit.arch ~= "x64",
   -- See also https://github.com/LuaJIT/LuaJIT/issues/606.
   ["Disabled due to LuaJIT/LuaJIT#606"] = os.getenv("LUAJIT_TABLE_BUMP"),
+  ["Memprof is disabled"] = os.getenv('LUAJIT_DISABLE_MEMPROF'),


      

      
Please use dougle quotes for this file (for the consistency).

    

    Fixed.

    

      



      

        
 })
 


      

      
<snipped>



      

        
-- 
2.34.1



      

      

    

  
  


--------------QGagX0fNyg8ePcZtvXSVdPht--