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 889F36EC40; Fri, 4 Jun 2021 16:38:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 889F36EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622813911; bh=fBCv8hNa0EP59E6FoktbqqXOdXi5chgSuk+H8fp3T4E=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=bj1Wt+dNZTj6i8Yv8PwAP21+53wz1r/HdVTicP30zWdlS+uUNQmVy/szWRflhAzmL 2txMm+ljZqzpc92Fru6x9hoGqddabvD2TPgZQZtYF0w3tOY0jV+pNnYAuSxD7wwbig tXzGN7vsdSFi+G9y5dEs10lf64VKbFq8FL1zlD7c= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 21DC86EC40 for ; Fri, 4 Jun 2021 16:38:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 21DC86EC40 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lpA1u-0003f0-4n; Fri, 04 Jun 2021 16:38:30 +0300 Date: Fri, 4 Jun 2021 16:37:19 +0300 To: Sergey Ostanevich Message-ID: References: <703b21b49b4f5b04b71b322c25528eff4fb2d0e3.1621859367.git.skaplun@tarantool.org> <7D81109B-6734-42E4-914D-2567D1438BE4@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7D81109B-6734-42E4-914D-2567D1438BE4@tarantool.org> X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C54907A7AE9C1BA82BC67C1327DFB87C6A6182A05F538085040835C2DC55FD197EF36BEB0AEE7AF880CFA8C8982EBFF5CA363B438A376F03187 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70CF6737295EB4C15EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006370CE4B4B08BC34B6C8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8873717CE8E9DF1B9A41D0CA7146AC80E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF1175FABE1C0F9B6A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18C26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6BF3059D42242344A089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C978312733F84B3505403850096BBBE4EB4356 X-C1DE0DAB: 0D63561A33F958A5C6B491CF68124505B685B028CCEACB11B8E5501214193C93D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75FBC5FED0552DA851410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341776B9FDE05FBA7A9A3F1C4C22EB97D6DD0FB00C7A988D5CD91DB459C246865D7F30CF1B42A5DA671D7E09C32AA3244C96EC1DBEC4C0E18BEBAA269FCF2903F44DBEAD0ED6C55A80FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojz99asgmzejr50vcHDHnfoQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822D38607FAB24702B6EDC81FCA9F65C0E30FBE9A32752B8C9C2AA642CC12EC09F1FB559BB5D741EB962F61BD320559CF1EFD657A8799238ED567EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/4] test: add skipcond on architectures for memprof 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 Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the review! On 02.06.21, Sergey Ostanevich wrote: > Hi! > > Thanks for the patch! > Just one fixup is needed. > > Sergos > > > On 24 May 2021, at 16:27, Sergey Kaplun wrote: > > > > Memprof's tests fail for architectures different from x86 and x64, > > because memprof is not yet implemented for them. > > > > This patch adds skip condition to corresponding test. > > --- > > test/tarantool-tests/misclib-memprof-lapi.test.lua | 6 ++++++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua > > index b4d66509..4df9cfd8 100644 > > --- a/test/tarantool-tests/misclib-memprof-lapi.test.lua > > +++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua > > @@ -1,3 +1,9 @@ > > +-- Memprof is implemented only for x86 and x64 architectures. > ^^^^ ——> ^ > > +require("utils").skipcond( > > + jit.arch ~= "x86" or jit.arch ~= "x64", > > I believe you overcomplicated the condition so it’ll skip even for > mentioned archs > > tarantool> x='x86' > --- > ... > > tarantool> x~='x86' or x~='x64' > --- > - true > ... > Thanks, nice catch! Fixed. Branch is force-pushed. =================================================================== diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua index 4df9cfd8..96beb680 100644 --- a/test/tarantool-tests/misclib-memprof-lapi.test.lua +++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua @@ -1,6 +1,6 @@ --- Memprof is implemented only for x86 and x64 architectures. +-- Memprof is implemented for only x86 and x64 architectures. require("utils").skipcond( - jit.arch ~= "x86" or jit.arch ~= "x64", + jit.arch ~= "x86" and jit.arch ~= "x64", jit.arch.." architecture is NIY for memprof" ) @@ -131,9 +131,9 @@ local free = fill_ev_type(events, symbols, "free") -- the number of allocations. -- 1 event - alocation of table by itself + 1 allocation -- of array part as far it is bigger than LJ_MAX_COLOSIZE (16). -test:ok(check_alloc_report(alloc, 21, 19, 2)) +test:ok(check_alloc_report(alloc, 27, 25, 2)) -- 100 strings allocations. -test:ok(check_alloc_report(alloc, 26, 19, 100)) +test:ok(check_alloc_report(alloc, 32, 25, 100)) -- Collect all previous allocated objects. test:ok(free.INTERNAL.num == 102) @@ -141,8 +141,8 @@ test:ok(free.INTERNAL.num == 102) -- Tests for leak-only option. -- See also https://github.com/tarantool/tarantool/issues/5812. local heap_delta = process.form_heap_delta(events, symbols) -local tab_alloc_stats = heap_delta[form_source_line(21)] -local str_alloc_stats = heap_delta[form_source_line(26)] +local tab_alloc_stats = heap_delta[form_source_line(27)] +local str_alloc_stats = heap_delta[form_source_line(32)] test:ok(tab_alloc_stats.nalloc == tab_alloc_stats.nfree) test:ok(tab_alloc_stats.dbytes == 0) test:ok(str_alloc_stats.nalloc == str_alloc_stats.nfree) =================================================================== > > > > + jit.arch.." architecture is NIY for memprof" > > +) > > + > > local tap = require("tap") > > > > local test = tap.test("misc-memprof-lapi") > > -- > > 2.31.0 > > > -- Best regards, Sergey Kaplun