mirror of
https://github.com/neovim/neovim.git
synced 2024-09-17 20:58:20 -04:00
fix(treesitter): make tests for memoize more robust
Instead of painfully messing with timing to determine if queries were reparsed, we can simply keep a counter next to the call to ts_query_new Also memoization had a hidden dependency on the garbage collection of the the key, a hash value which never is kept around in memory. this was done intentionally as the hash does not capture all relevant state for the query (external included files) even if actual query objects still would be reachable in memory. To make the test fully deterministic in CI, we explicitly control GC.
This commit is contained in:
parent
ca432069eb
commit
0df681a91d
@ -45,6 +45,7 @@
|
||||
#include "nvim/keycodes.h"
|
||||
#include "nvim/log.h"
|
||||
#include "nvim/lua/executor.h"
|
||||
#include "nvim/lua/treesitter.h"
|
||||
#include "nvim/macros_defs.h"
|
||||
#include "nvim/mapping.h"
|
||||
#include "nvim/mark.h"
|
||||
@ -1806,12 +1807,13 @@ Float nvim__id_float(Float flt)
|
||||
/// @return Map of various internal stats.
|
||||
Dictionary nvim__stats(Arena *arena)
|
||||
{
|
||||
Dictionary rv = arena_dict(arena, 5);
|
||||
Dictionary rv = arena_dict(arena, 6);
|
||||
PUT_C(rv, "fsync", INTEGER_OBJ(g_stats.fsync));
|
||||
PUT_C(rv, "log_skip", INTEGER_OBJ(g_stats.log_skip));
|
||||
PUT_C(rv, "lua_refcount", INTEGER_OBJ(nlua_get_global_ref_count()));
|
||||
PUT_C(rv, "redraw", INTEGER_OBJ(g_stats.redraw));
|
||||
PUT_C(rv, "arena_alloc_count", INTEGER_OBJ((Integer)arena_alloc_count));
|
||||
PUT_C(rv, "ts_query_parse_count", INTEGER_OBJ((Integer)tslua_query_parse_count));
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -1318,6 +1318,7 @@ int tslua_parse_query(lua_State *L)
|
||||
size_t len;
|
||||
const char *src = lua_tolstring(L, 2, &len);
|
||||
|
||||
tslua_query_parse_count++;
|
||||
uint32_t error_offset;
|
||||
TSQueryError error_type;
|
||||
TSQuery *query = ts_query_new(lang, src, (uint32_t)len, &error_offset, &error_type);
|
||||
|
@ -1,7 +1,12 @@
|
||||
#pragma once
|
||||
|
||||
#include <lua.h> // IWYU pragma: keep
|
||||
#include <stdint.h>
|
||||
|
||||
#include "nvim/macros_defs.h"
|
||||
|
||||
#ifdef INCLUDE_GENERATED_DECLARATIONS
|
||||
# include "lua/treesitter.h.generated.h"
|
||||
#endif
|
||||
|
||||
EXTERN uint64_t tslua_query_parse_count INIT( = 0);
|
||||
|
@ -63,6 +63,7 @@
|
||||
#include "nvim/log.h"
|
||||
#include "nvim/lua/executor.h"
|
||||
#include "nvim/lua/secure.h"
|
||||
#include "nvim/lua/treesitter.h"
|
||||
#include "nvim/macros_defs.h"
|
||||
#include "nvim/main.h"
|
||||
#include "nvim/mark.h"
|
||||
|
@ -7,7 +7,6 @@ local eq = t.eq
|
||||
local insert = n.insert
|
||||
local exec_lua = n.exec_lua
|
||||
local pcall_err = t.pcall_err
|
||||
local is_os = t.is_os
|
||||
local api = n.api
|
||||
local fn = n.fn
|
||||
|
||||
@ -72,11 +71,14 @@ void ui_refresh(void)
|
||||
return exec_lua(
|
||||
[[
|
||||
local query, n = ...
|
||||
local before = vim.uv.hrtime()
|
||||
local before = vim.api.nvim__stats().ts_query_parse_count
|
||||
collectgarbage("stop")
|
||||
for i=1, n, 1 do
|
||||
cquery = vim.treesitter.query.parse("c", ...)
|
||||
end
|
||||
local after = vim.uv.hrtime()
|
||||
collectgarbage("restart")
|
||||
collectgarbage("collect")
|
||||
local after = vim.api.nvim__stats().ts_query_parse_count
|
||||
return after - before
|
||||
]],
|
||||
long_query,
|
||||
@ -84,15 +86,9 @@ void ui_refresh(void)
|
||||
)
|
||||
end
|
||||
|
||||
local firstrun = q(1)
|
||||
local manyruns = q(100)
|
||||
|
||||
-- First run should be at least 200x slower than an 100 subsequent runs.
|
||||
local factor = is_os('win') and 100 or 200
|
||||
assert(
|
||||
factor * manyruns < firstrun,
|
||||
('firstrun: %f ms, manyruns: %f ms'):format(firstrun / 1e6, manyruns / 1e6)
|
||||
)
|
||||
eq(1, q(1))
|
||||
-- cache is cleared by garbage collection even if valid "cquery" reference is kept around
|
||||
eq(1, q(100))
|
||||
end)
|
||||
|
||||
it('supports query and iter by capture (iter_captures)', function()
|
||||
|
Loading…
Reference in New Issue
Block a user