logiguard fork v3: full patch set on verified 8c74db0 tree
Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Mohamad Khani
105
crates/editor/benches/display_map.rs
Normal file
105
crates/editor/benches/display_map.rs
Normal file
@@ -0,0 +1,105 @@
|
||||
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
|
||||
use editor::MultiBuffer;
|
||||
use gpui::TestDispatcher;
|
||||
use itertools::Itertools;
|
||||
use multi_buffer::MultiBufferOffset;
|
||||
use rand::{Rng, SeedableRng, rngs::StdRng};
|
||||
use std::num::NonZeroU32;
|
||||
use text::Bias;
|
||||
use util::RandomCharIter;
|
||||
|
||||
fn to_tab_point_benchmark(c: &mut Criterion) {
|
||||
let dispatcher = TestDispatcher::new(1);
|
||||
let cx = gpui::TestAppContext::build(dispatcher, None);
|
||||
|
||||
let create_tab_map = |length: usize| {
|
||||
let mut rng = StdRng::seed_from_u64(1);
|
||||
let text = RandomCharIter::new(&mut rng)
|
||||
.take(length)
|
||||
.collect::<String>();
|
||||
let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
|
||||
|
||||
let buffer_snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
|
||||
use editor::display_map::*;
|
||||
let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
|
||||
let (_, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
|
||||
let fold_point = fold_snapshot.to_fold_point(
|
||||
inlay_snapshot.to_point(InlayOffset(
|
||||
rng.random_range(MultiBufferOffset(0)..MultiBufferOffset(length)),
|
||||
)),
|
||||
Bias::Left,
|
||||
);
|
||||
let (_, snapshot) = TabMap::new(fold_snapshot, NonZeroU32::new(4).unwrap());
|
||||
|
||||
(length, snapshot, fold_point)
|
||||
};
|
||||
|
||||
let inputs = [1024].into_iter().map(create_tab_map).collect_vec();
|
||||
|
||||
let mut group = c.benchmark_group("To tab point");
|
||||
|
||||
for (batch_size, snapshot, fold_point) in inputs {
|
||||
group.bench_with_input(
|
||||
BenchmarkId::new("to_tab_point", batch_size),
|
||||
&snapshot,
|
||||
|bench, snapshot| {
|
||||
bench.iter(|| {
|
||||
snapshot.fold_point_to_tab_point(fold_point);
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
group.finish();
|
||||
}
|
||||
|
||||
fn to_fold_point_benchmark(c: &mut Criterion) {
|
||||
let dispatcher = TestDispatcher::new(1);
|
||||
let cx = gpui::TestAppContext::build(dispatcher, None);
|
||||
|
||||
let create_tab_map = |length: usize| {
|
||||
let mut rng = StdRng::seed_from_u64(1);
|
||||
let text = RandomCharIter::new(&mut rng)
|
||||
.take(length)
|
||||
.collect::<String>();
|
||||
let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
|
||||
|
||||
let buffer_snapshot = cx.read(|cx| buffer.read(cx).snapshot(cx));
|
||||
use editor::display_map::*;
|
||||
let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
|
||||
let (_, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
|
||||
|
||||
let fold_point = fold_snapshot.to_fold_point(
|
||||
inlay_snapshot.to_point(InlayOffset(
|
||||
rng.random_range(MultiBufferOffset(0)..MultiBufferOffset(length)),
|
||||
)),
|
||||
Bias::Left,
|
||||
);
|
||||
|
||||
let (_, snapshot) = TabMap::new(fold_snapshot, NonZeroU32::new(4).unwrap());
|
||||
let tab_point = snapshot.fold_point_to_tab_point(fold_point);
|
||||
|
||||
(length, snapshot, tab_point)
|
||||
};
|
||||
|
||||
let inputs = [1024].into_iter().map(create_tab_map).collect_vec();
|
||||
|
||||
let mut group = c.benchmark_group("To fold point");
|
||||
|
||||
for (batch_size, snapshot, tab_point) in inputs {
|
||||
group.bench_with_input(
|
||||
BenchmarkId::new("to_fold_point", batch_size),
|
||||
&snapshot,
|
||||
|bench, snapshot| {
|
||||
bench.iter(|| {
|
||||
snapshot.tab_point_to_fold_point(tab_point, Bias::Left);
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
group.finish();
|
||||
}
|
||||
|
||||
criterion_group!(benches, to_tab_point_benchmark, to_fold_point_benchmark);
|
||||
criterion_main!(benches);
|
||||
167
crates/editor/benches/editor_render.rs
Normal file
167
crates/editor/benches/editor_render.rs
Normal file
@@ -0,0 +1,167 @@
|
||||
use criterion::{Bencher, BenchmarkId};
|
||||
use editor::{
|
||||
Editor, EditorMode, MultiBuffer,
|
||||
actions::{DeleteToPreviousWordStart, SelectAll, SplitSelectionIntoLines},
|
||||
};
|
||||
use gpui::{AppContext, Focusable as _, TestAppContext, TestDispatcher};
|
||||
use rand::{Rng as _, SeedableRng as _, rngs::StdRng};
|
||||
use settings::SettingsStore;
|
||||
use ui::IntoElement;
|
||||
use util::RandomCharIter;
|
||||
|
||||
fn editor_input_with_1000_cursors(bencher: &mut Bencher<'_>, cx: &TestAppContext) {
|
||||
let mut cx = cx.clone();
|
||||
let text = String::from_iter(["line:\n"; 1000]);
|
||||
let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
|
||||
|
||||
let cx = cx.add_empty_window();
|
||||
let editor = cx.update(|window, cx| {
|
||||
let editor = cx.new(|cx| {
|
||||
let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
|
||||
editor.set_style(editor::EditorStyle::default(), window, cx);
|
||||
editor.select_all(&SelectAll, window, cx);
|
||||
editor.split_selection_into_lines(
|
||||
&SplitSelectionIntoLines {
|
||||
keep_selections: true,
|
||||
},
|
||||
window,
|
||||
cx,
|
||||
);
|
||||
editor
|
||||
});
|
||||
window.focus(&editor.focus_handle(cx), cx);
|
||||
editor
|
||||
});
|
||||
|
||||
bencher.iter(|| {
|
||||
cx.update(|window, cx| {
|
||||
editor.update(cx, |editor, cx| {
|
||||
editor.handle_input("hello world", window, cx);
|
||||
editor.delete_to_previous_word_start(
|
||||
&DeleteToPreviousWordStart {
|
||||
ignore_newlines: false,
|
||||
ignore_brackets: false,
|
||||
},
|
||||
window,
|
||||
cx,
|
||||
);
|
||||
editor.delete_to_previous_word_start(
|
||||
&DeleteToPreviousWordStart {
|
||||
ignore_newlines: false,
|
||||
ignore_brackets: false,
|
||||
},
|
||||
window,
|
||||
cx,
|
||||
);
|
||||
});
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
fn open_editor_with_one_long_line(bencher: &mut Bencher<'_>, args: &(String, TestAppContext)) {
|
||||
let (text, cx) = args;
|
||||
let mut cx = cx.clone();
|
||||
|
||||
bencher.iter(|| {
|
||||
let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
|
||||
|
||||
let cx = cx.add_empty_window();
|
||||
let _ = cx.update(|window, cx| {
|
||||
let editor = cx.new(|cx| {
|
||||
let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
|
||||
editor.set_style(editor::EditorStyle::default(), window, cx);
|
||||
editor
|
||||
});
|
||||
window.focus(&editor.focus_handle(cx), cx);
|
||||
editor
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn editor_render(bencher: &mut Bencher<'_>, cx: &TestAppContext) {
|
||||
let mut cx = cx.clone();
|
||||
let buffer = cx.update(|cx| {
|
||||
let mut rng = StdRng::seed_from_u64(1);
|
||||
let text_len = rng.random_range(10000..90000);
|
||||
if rng.random() {
|
||||
let text = RandomCharIter::new(&mut rng)
|
||||
.take(text_len)
|
||||
.collect::<String>();
|
||||
MultiBuffer::build_simple(&text, cx)
|
||||
} else {
|
||||
MultiBuffer::build_random(&mut rng, cx)
|
||||
}
|
||||
});
|
||||
|
||||
let cx = cx.add_empty_window();
|
||||
let editor = cx.update(|window, cx| {
|
||||
let editor = cx.new(|cx| {
|
||||
let mut editor = Editor::new(EditorMode::full(), buffer, None, window, cx);
|
||||
editor.set_style(editor::EditorStyle::default(), window, cx);
|
||||
editor
|
||||
});
|
||||
window.focus(&editor.focus_handle(cx), cx);
|
||||
editor
|
||||
});
|
||||
|
||||
bencher.iter(|| {
|
||||
cx.update(|window, cx| {
|
||||
// editor.update(cx, |editor, cx| editor.move_down(&MoveDown, window, cx));
|
||||
let mut view = editor.clone().into_any_element();
|
||||
let _ = view.request_layout(window, cx);
|
||||
let _ = view.prepaint(window, cx);
|
||||
view.paint(window, cx);
|
||||
});
|
||||
})
|
||||
}
|
||||
|
||||
pub fn benches() {
|
||||
let dispatcher = TestDispatcher::new(1);
|
||||
let cx = gpui::TestAppContext::build(dispatcher, None);
|
||||
cx.update(|cx| {
|
||||
let store = SettingsStore::test(cx);
|
||||
cx.set_global(store);
|
||||
assets::Assets.load_test_fonts(cx);
|
||||
theme_settings::init(theme::LoadThemes::JustBase, cx);
|
||||
// release_channel::init(semver::Version::new(0,0,0), cx);
|
||||
editor::init(cx);
|
||||
});
|
||||
|
||||
let mut criterion: criterion::Criterion<_> =
|
||||
(criterion::Criterion::default()).configure_from_args();
|
||||
|
||||
// setup app context
|
||||
let mut group = criterion.benchmark_group("Time to render");
|
||||
group.bench_with_input(
|
||||
BenchmarkId::new("editor_render", "TestAppContext"),
|
||||
&cx,
|
||||
editor_render,
|
||||
);
|
||||
|
||||
group.finish();
|
||||
|
||||
let text = String::from_iter(["char"; 1000]);
|
||||
let mut group = criterion.benchmark_group("Build buffer with one long line");
|
||||
group.bench_with_input(
|
||||
BenchmarkId::new("editor_with_one_long_line", "(String, TestAppContext )"),
|
||||
&(text, cx.clone()),
|
||||
open_editor_with_one_long_line,
|
||||
);
|
||||
|
||||
group.finish();
|
||||
|
||||
let mut group = criterion.benchmark_group("multi cursor edits");
|
||||
group.bench_with_input(
|
||||
BenchmarkId::new("editor_input_with_1000_cursors", "TestAppContext"),
|
||||
&cx,
|
||||
editor_input_with_1000_cursors,
|
||||
);
|
||||
group.finish();
|
||||
}
|
||||
|
||||
fn main() {
|
||||
benches();
|
||||
criterion::Criterion::default()
|
||||
.configure_from_args()
|
||||
.final_summary();
|
||||
}
|
||||
Reference in New Issue
Block a user