aboutsummaryrefslogtreecommitdiff
path: root/grid.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-08-22 15:33:23 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-08-22 15:33:23 +0000
commit7c7720a3ab314e471499194f114797ca7a40afde (patch)
tree1113380cb5fa7456ccebf71ed72c1b9d9d672c14 /grid.h
parentgenerate-alt-random-writes: generate color, scroll and scroll region sequences (diff)
scrolling: optimize row access by assuming number of rows is a power of 2
With this assumption, we can replace 'a % b' with 'a & (b - 1)'. In terms of instructions, this means a fast 'and' instead of a slow 'div'. Further optimize scrolling by: * not double-initializing empty rows. Previously, grid_row_alloc() called calloc(), which was then followed by a memset() when scrolling. This is of course unnecessary. * Don't loop the entire set of visible rows (this was done to ensure all visible rows had been allocated, and to prefetch the cell contents). This isn't necessary; only newly pulled in rows can be NULL. For now, don't prefetch at all.
Diffstat (limited to 'grid.h')
-rw-r--r--grid.h28
1 files changed, 20 insertions, 8 deletions
diff --git a/grid.h b/grid.h
index 4a25d218..a421a5c0 100644
--- a/grid.h
+++ b/grid.h
@@ -3,33 +3,45 @@
#include <stddef.h>
#include "terminal.h"
-void grid_swap_row(struct grid *grid, int row_a, int row_b);
-struct row *grid_row_alloc(int cols);
+void grid_swap_row(struct grid *grid, int row_a, int row_b, bool initialize);
+struct row *grid_row_alloc(int cols, bool initialize);
void grid_row_free(struct row *row);
static inline struct row *
-grid_row(struct grid *grid, int row_no)
+_grid_row_maybe_alloc(struct grid *grid, int row_no, bool alloc_if_null)
{
assert(grid->offset >= 0);
- int real_row = (grid->offset + row_no + grid->num_rows) % grid->num_rows;
+ int real_row = (grid->offset + row_no) & (grid->num_rows - 1);
struct row *row = grid->rows[real_row];
- if (row == NULL) {
- row = grid_row_alloc(grid->num_cols);
+ if (row == NULL && alloc_if_null) {
+ row = grid_row_alloc(grid->num_cols, false);
grid->rows[real_row] = row;
}
- __builtin_prefetch(row->cells, 1, 3);
+ assert(row != NULL);
return row;
}
static inline struct row *
+grid_row(struct grid *grid, int row_no)
+{
+ return _grid_row_maybe_alloc(grid, row_no, false);
+}
+
+static inline struct row *
+grid_row_and_alloc(struct grid *grid, int row_no)
+{
+ return _grid_row_maybe_alloc(grid, row_no, true);
+}
+
+static inline struct row *
grid_row_in_view(struct grid *grid, int row_no)
{
assert(grid->view >= 0);
- int real_row = (grid->view + row_no + grid->num_rows) % grid->num_rows;
+ int real_row = (grid->view + row_no) & (grid->num_rows - 1);
struct row *row = grid->rows[real_row];
assert(row != NULL);