Tarantool development patches archive
 help / color / mirror / Atom feed
From: Sergey Ostanevich via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit 2/4] test: add skipcond on architectures for memprof
Date: Fri, 4 Jun 2021 18:36:08 +0300
Message-ID: <BFEF7BA1-3F26-452F-9D18-35422EEA9454@tarantool.org> (raw)
In-Reply-To: <YLosjw8cGrZlIkOv@root>

[-- Attachment #1: Type: text/plain, Size: 3858 bytes --]

Hi!

Thanks for the update. 
I was bad in my ASCII art. The change I expected was

> +-- Memprof is implemented for x86 and x64 architectures only.

LGTM
Sergos


> On 4 Jun 2021, at 16:37, Sergey Kaplun <skaplun@tarantool.org> wrote:
> 
> 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 <skaplun@tarantool.org> 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 <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


[-- Attachment #2: Type: text/html, Size: 42526 bytes --]

  reply	other threads:[~2021-06-04 15:36 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24 13:27 [Tarantool-patches] [PATCH luajit 0/4] Fix LuaJIT tests on aarch64, odroid Sergey Kaplun via Tarantool-patches
2021-05-24 13:27 ` [Tarantool-patches] [PATCH luajit 1/4] ARM, ARM64, PPC: Fix TSETR fallback Sergey Kaplun via Tarantool-patches
2021-06-02 12:04   ` Sergey Ostanevich via Tarantool-patches
2021-06-04 13:12     ` Sergey Kaplun via Tarantool-patches
2021-06-04 15:33       ` Sergey Ostanevich via Tarantool-patches
2021-06-04 15:39         ` Sergey Kaplun via Tarantool-patches
2021-06-10 13:51   ` Igor Munkin via Tarantool-patches
2021-06-11  8:47     ` Sergey Kaplun via Tarantool-patches
2021-06-12 13:09       ` Sergey Kaplun via Tarantool-patches
2021-05-24 13:27 ` [Tarantool-patches] [PATCH luajit 2/4] test: add skipcond on architectures for memprof Sergey Kaplun via Tarantool-patches
2021-06-02 12:28   ` Sergey Ostanevich via Tarantool-patches
2021-06-04 13:37     ` Sergey Kaplun via Tarantool-patches
2021-06-04 15:36       ` Sergey Ostanevich via Tarantool-patches [this message]
2021-06-04 16:18         ` Sergey Kaplun via Tarantool-patches
2021-06-10 13:51   ` Igor Munkin via Tarantool-patches
2021-06-11  8:18     ` Sergey Kaplun via Tarantool-patches
2021-05-24 13:27 ` [Tarantool-patches] [PATCH luajit 3/4] ARM64: Fix xpcall() error case Sergey Kaplun via Tarantool-patches
2021-06-02 12:47   ` Sergey Ostanevich via Tarantool-patches
2021-06-04 13:45     ` Sergey Kaplun via Tarantool-patches
2021-06-10 13:51   ` Igor Munkin via Tarantool-patches
2021-05-24 13:27 ` [Tarantool-patches] [PATCH luajit 4/4] ARM64: Fix xpcall() error case (really) Sergey Kaplun via Tarantool-patches
2021-06-02 14:43   ` Sergey Ostanevich via Tarantool-patches
2021-06-04 13:56     ` Sergey Kaplun via Tarantool-patches
2021-06-10 13:52   ` Igor Munkin via Tarantool-patches
2021-06-11  8:08     ` Sergey Kaplun via Tarantool-patches
2021-06-01 11:11 ` [Tarantool-patches] [PATCH luajit 0/4] Fix LuaJIT tests on aarch64, odroid Igor Munkin via Tarantool-patches
2021-06-12 16:02 ` Igor Munkin via Tarantool-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BFEF7BA1-3F26-452F-9D18-35422EEA9454@tarantool.org \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=sergos@tarantool.org \
    --cc=skaplun@tarantool.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Tarantool development patches archive

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lists.tarantool.org/tarantool-patches/0 tarantool-patches/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 tarantool-patches tarantool-patches/ https://lists.tarantool.org/tarantool-patches \
		tarantool-patches@dev.tarantool.org.
	public-inbox-index tarantool-patches

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git