mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 00:38:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Micro-optimize clearing of lines

Browse Source 
Use a doubling strategy to memset arrays to a fixed value. Makes the
memset O(log(N)) from O(N) in number of calls to memcpy.
This commit is contained in:
Kovid Goyal
2024-01-20 13:19:09 +05:30
parent d0621cb82a
commit 06da31019c
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kitty/data-types.h
View File

@@ -427,3 +427,13 @@ SPRITE_MAP_HANDLE alloc_sprite_map(unsigned int, unsigned int);
SPRITE_MAP_HANDLE free_sprite_map(SPRITE_MAP_HANDLE); SPRITE_MAP_HANDLE free_sprite_map(SPRITE_MAP_HANDLE);
const char* get_hyperlink_for_id(const HYPERLINK_POOL_HANDLE, hyperlink_id_type id, bool only_url); const char* get_hyperlink_for_id(const HYPERLINK_POOL_HANDLE, hyperlink_id_type id, bool only_url);
void log_event(const char *format, ...) __attribute__((format(printf, 1, 2))); void log_event(const char *format, ...) __attribute__((format(printf, 1, 2)));
#define memset_array(array, val, count) if ((count) > 0) { \
(array)[0] = (val); \
size_t __copied__ = 1; \
while (__copied__ < (count)) { \
const size_t __num__ = MIN(__copied__, (count) - __copied__); \
memcpy((array) + __copied__, (array), __num__ * sizeof((val))); \
__copied__ += __num__; \
} \
}

2
kitty/line-buf.c
View File

@@ -154,7 +154,7 @@ linebuf_clear_lines(LineBuf *self, const Cursor *cursor, index_type start, index
#define lineptr(which, i) which##_lineptr(self, self->line_map[i]) #define lineptr(which, i) which##_lineptr(self, self->line_map[i])
GPUCell *first_gpu_line = lineptr(gpu, start); GPUCell *first_gpu_line = lineptr(gpu, start);
const GPUCell gc = cursor_as_gpu_cell(cursor); const GPUCell gc = cursor_as_gpu_cell(cursor);
for (index_type i = 0; i < self->xnum; i++) memcpy(first_gpu_line + i, &gc, sizeof(GPUCell)); memset_array(first_gpu_line, gc, self->xnum);
const size_t cpu_stride = sizeof(CPUCell) * self->xnum; const size_t cpu_stride = sizeof(CPUCell) * self->xnum;
memset(lineptr(cpu, start), 0, cpu_stride); memset(lineptr(cpu, start), 0, cpu_stride);
const size_t gpu_stride = sizeof(GPUCell) * self->xnum; const size_t gpu_stride = sizeof(GPUCell) * self->xnum;

16
kitty/line.c
View File

@@ -521,11 +521,10 @@ cursor_from(Line* self, PyObject *args) {
void void
line_clear_text(Line *self, unsigned int at, unsigned int num, char_type ch) { line_clear_text(Line *self, unsigned int at, unsigned int num, char_type ch) {
const uint16_t width = ch ? 1 : 0; const uint16_t width = ch ? 1 : 0;
for (index_type i = at; i < MIN(self->xnum, at + num); i++) { const CPUCell cc = {.ch=ch};
self->cpu_cells[i].ch = ch; memset(self->cpu_cells[i].cc_idx, 0, sizeof(self->cpu_cells[i].cc_idx)); if (at + num > self->xnum) num = self->xnum > at ? self->xnum - at : 0;
self->cpu_cells[i].hyperlink_id = 0; memset_array(self->cpu_cells + at, cc, num);
self->gpu_cells[i].attrs.width = width; for (index_type i = at; i < at + num; i++) self->gpu_cells[i].attrs.width = width;
}
} }
static PyObject* static PyObject*
@@ -545,10 +544,9 @@ line_apply_cursor(Line *self, const Cursor *cursor, unsigned int at, unsigned in
#if BLANK_CHAR != 0 #if BLANK_CHAR != 0
#error This implementation is incorrect for BLANK_CHAR != 0 #error This implementation is incorrect for BLANK_CHAR != 0
#endif #endif
for (index_type i = at; i < self->xnum && i < at + num; i++) { if (at + num > self->xnum) { num = at < self->xnum ? self->xnum - at : 0; }
memset(self->cpu_cells + i, 0, sizeof(self->cpu_cells[0])); memset(self->cpu_cells + at, 0, num * sizeof(CPUCell));
memcpy(self->gpu_cells + i, &gc, sizeof(gc)); memset_array(self->gpu_cells + at, gc, num);
}
} else { } else {
for (index_type i = at; i < self->xnum && i < at + num; i++) { for (index_type i = at; i < self->xnum && i < at + num; i++) {
gc.attrs.width = self->gpu_cells[i].attrs.width; gc.attrs.width = self->gpu_cells[i].attrs.width;