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 C9D0512292C0; Thu, 13 Feb 2025 14:13:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C9D0512292C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1739445213; bh=VzMjxzY9Wi7BI7dI4uRs3D4YjorBkIvCICa5YiJZuqE=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=BBL12cHBWtm9WWxrlkqXQd2YUGmOx6VdcnHhjCbLdgU/+uONy5Jc5Sr8upSVWHhoI 7DkpuoHC8xyOpis9nFF41Xbi72r4HEyoFdOCMira0Oz7dqbRNcl2lTiha8R//lyK2x u0diEdgYV0xD35gnrkDDZMdJjJ/l4odoq2c7tAGY= Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 6067312292C0 for ; Thu, 13 Feb 2025 14:11:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6067312292C0 Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-ab7ee6f54faso86766766b.2 for ; Thu, 13 Feb 2025 03:11:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739445103; x=1740049903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JlqFuQRSGpuGaloSztwmdOO7KFH9p9I4vAeY65ltgFg=; b=NObdz+eYy0Wg4XWIQwfI+rNn2j8Q6ObCCVAvO1l3OL5tq50myXhKXRfjWwoXX1ZCxu LxekeiLuTdg7rvibxH+TuWmS918kF6cjw7ma3susGBITW7PLdDUYjPHhym3cekTGYXOx AEHf79tG2cEgVN4Q6S5wA7Xys/rjmmtMxXSCTagEdG6gNivFhgu7HYCdz0sid/wzGcIC bh+9jT5z/W7Kyyty5kobqtRPgfLXv4QpTE2NgLTDBDZev8JqEGvo0TfqHwOoH9u1vMKA 1FFfnH5xUk4wuXqum0GIyXPtlUtpxJgFuCUSJXzH0kZ+1MmS9IVAfEha5IJMEMfekLIj G14A== X-Gm-Message-State: AOJu0YznW0d4gaqiJVCHdxCt88Yg+whvqweSA1kpwNddtaPVUbe0RPZV CWy279xkOqPhQR5gan9b3T6K+WI+QG9K4jyxWE9YNyEU6Q3l7ssIjDObVvL7 X-Gm-Gg: ASbGncsjOgd53nC3EJjUPgNJy5HxSaa0XO+RaZJBFCFnU6dfejWdlT/MXy83lCNoHwI Ub2s07YOMwGU/+/CCoqZ3zIDKwoXnG5euKac0IlYKHPD5YNegmNeOsKsH8fj+9qd2x5XMMAukCz awq2L/KhSRmZ5g9iL8vDx2GPr3mIXJMhFuw9TNRg9PpO5rk1nP+AaIx70a5MyWOsIt9ZKrassvX jsC7k8ll6fttIzhfUd/ad1l2msXW+QbLSooe3NHvF5AJ3L2NUPtxM3//V9+Olx2wyTfY9UAsYUR bckLZA== X-Google-Smtp-Source: AGHT+IGcHBwVPL8iYvj8/6fGn1VBaPU+Z8QZ6iDI80fWQZoPCcrw98uJV1heA9JA6+TF1soEAyWiww== X-Received: by 2002:a05:6402:538b:b0:5dc:6e27:e6e8 with SMTP id 4fb4d7f45d1cf-5dec9e99952mr6690111a12.24.1739445102874; Thu, 13 Feb 2025 03:11:42 -0800 (PST) Received: from localhost ([5.181.62.98]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ded709a92bsm65551a12.63.2025.02.13.03.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 03:11:42 -0800 (PST) X-Google-Original-From: Sergey Bronnikov To: tarantool-patches@dev.tarantool.org, Sergey Kaplun Date: Thu, 13 Feb 2025 14:10:47 +0300 Message-Id: <4defed95d90fee0536d841337b134220d493823e.1739444510.git.sergeyb@tarantool.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [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" 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 ++++++++------- 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] 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 @@ -97,6 +97,10 @@ if(LUAJIT_DISABLE_SYSPROF) list(APPEND LUA_TEST_ENV_MORE LUAJIT_DISABLE_SYSPROF=1) endif() +if(LUAJIT_DISABLE_MEMPROF) + list(APPEND LUA_TEST_ENV_MORE LUAJIT_DISABLE_MEMPROF=1) +endif() + # Needed to skip some long tests or tests using signals. # See also https://github.com/tarantool/tarantool/issues/10803. if(LUAJIT_USE_VALGRIND) diff --git a/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua b/test/tarantool-tests/profilers/gh-5994-memprof-human-readable.test.lua 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'), }) 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'), }) test:plan(5) @@ -164,9 +165,9 @@ test:test("output", function(subtest) -- one is the number of allocations. 1 event - allocation of -- table by itself + 1 allocation of array part as far it is -- bigger than LJ_MAX_COLOSIZE (16). - subtest:ok(check_alloc_report(alloc, { line = 39, linedefined = 37 }, 2)) + subtest:ok(check_alloc_report(alloc, { line = 40, linedefined = 38 }, 2)) -- 20 strings allocations. - subtest:ok(check_alloc_report(alloc, { line = 44, linedefined = 37 }, 20)) + subtest:ok(check_alloc_report(alloc, { line = 45, linedefined = 38 }, 20)) -- Collect all previous allocated objects. subtest:ok(free.INTERNAL == 22) @@ -174,8 +175,8 @@ test:test("output", function(subtest) -- Tests for leak-only option. -- See also https://github.com/tarantool/tarantool/issues/5812. local heap_delta = process.form_heap_delta(events) - local tab_alloc_stats = heap_delta[form_source_line(39)] - local str_alloc_stats = heap_delta[form_source_line(44)] + local tab_alloc_stats = heap_delta[form_source_line(40)] + local str_alloc_stats = heap_delta[form_source_line(45)] subtest:ok(tab_alloc_stats.nalloc == tab_alloc_stats.nfree) subtest:ok(tab_alloc_stats.dbytes == 0) subtest:ok(str_alloc_stats.nalloc == str_alloc_stats.nfree) @@ -260,10 +261,10 @@ test:test("jit-output", function(subtest) -- 10 allocations in interpreter mode, 1 allocation for a trace -- recording and assembling and next 9 allocations will happen -- while running the trace. - subtest:ok(check_alloc_report(alloc, { line = 44, linedefined = 37 }, 11)) - subtest:ok(check_alloc_report(alloc, { traceno = 1, line = 42 }, 9)) + subtest:ok(check_alloc_report(alloc, { line = 45, linedefined = 38 }, 11)) + subtest:ok(check_alloc_report(alloc, { traceno = 1, line = 43 }, 9)) -- See same checks with jit.off(). - subtest:ok(check_alloc_report(alloc, { line = 39, linedefined = 37 }, 2)) + subtest:ok(check_alloc_report(alloc, { line = 40, linedefined = 38 }, 2)) -- Restore default JIT settings. jit.opt.start(unpack(jit_opt_default)) -- 2.34.1