mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-11 11:09:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Work on using SIMD for normal mode dispatch

Browse Source
This commit is contained in:
Kovid Goyal
2023-11-10 16:19:57 +05:30
parent a75fb6509e
commit 25e7a2882d
3 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kitty/simd-string.c
View File

@@ -123,3 +123,18 @@ uint8_t*
find_either_of_two_bytes(uint8_t *haystack, const size_t sz, const uint8_t a, const uint8_t b) {
return find_either_of_two_bytes_simd(haystack, sz, a, b);
}
static const uint8_t*
find_start_of_two_ranges_simple(const uint8_t *haystack, const size_t sz, const uint8_t a1, const uint8_t a2, const uint8_t a3, const uint8_t a4) {
ByteLoader it; byte_loader_init(&it, haystack, sz);
while (it.num_left) {
const uint8_t ch = byte_loader_next(&it);
if ((a1 <= ch && ch <= a2) || (a3 <= ch && ch <= a4)) return haystack + sz - it.num_left - 1;
}
return NULL;
}
uint8_t*
find_start_of_two_ranges(uint8_t *haystack, const size_t sz, const uint8_t a1, const uint8_t a2, const uint8_t a3, const uint8_t a4) {
return (uint8_t*)find_start_of_two_ranges_simple(haystack, sz, a1, a2, a3, a4);
}

6
kitty/simd-string.h
View File

@@ -25,3 +25,9 @@ uint8_t byte_loader_next(ByteLoader *self);
// be readable. Returns pointer to first position in haystack that contains
// either of the two chars or NULL if not found.
uint8_t* find_either_of_two_bytes(uint8_t *haystack, const size_t sz, const uint8_t a, const uint8_t b);
// Requires haystack[sz] to be writable and 7 bytes to the left of haystack to
// be readable. Returns pointer to first position in haystack that contains
// a char that is in [a1, a2] or [a2, a3]
uint8_t*
find_start_of_two_ranges(uint8_t *haystack, const size_t sz, const uint8_t a1, const uint8_t a2, const uint8_t a3, const uint8_t a4);

26
kitty/vt-parser.c
View File

@@ -272,14 +272,26 @@ dispatch_normal_mode_byte(PS *self, uint8_t ch) {
}
static void
consume_normal(PS *self) {
const unsigned sz = self->read.sz - self->read.pos;
ByteLoader b; byte_loader_init(&b, self->buf + self->read.pos, sz);
while (b.num_left && self->vte_state == VTE_NORMAL) {
uint8_t ch = byte_loader_next(&b);
dispatch_normal_mode_byte(self, ch);
dispatch_printable_ascii(PS *self, const size_t sz) {
for (const size_t limit = self->read.pos + sz; self->read.pos < limit; self->read.pos++) {
REPORT_DRAW(self->buf[self->read.pos]);
screen_draw(self->screen, self->buf[self->read.pos], true);
}
self->read.pos += sz - b.num_left;
}
static void
consume_normal(PS *self) {
do {
if (self->utf8.state == UTF8_ACCEPT) {
size_t sz = self->read.sz - self->read.pos;
uint8_t *p = find_start_of_two_ranges(self->buf + self->read.pos, sz, 0, 31, 0x7f, 0xff);
if (p != NULL) sz = p - (self->buf + self->read.pos);
if (sz) dispatch_printable_ascii(self, sz);
else dispatch_normal_mode_byte(self, self->buf[self->read.pos++]);
} else {
dispatch_normal_mode_byte(self, self->buf[self->read.pos++]);
}
} while (self->read.pos < self->read.sz && self->vte_state == VTE_NORMAL);
}
// }}}