-
Notifications
You must be signed in to change notification settings - Fork 958
Perf: Optimize comparison kernels for inlined views #7731
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 6 commits
4bc4122
0e4a6cd
8a552a4
399297f
e9b5e44
c089841
dddf67a
4fa53b5
5eec94b
fb82e8b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -566,12 +566,18 @@ impl<'a, T: ByteViewType> ArrayOrd for &'a GenericByteViewArray<T> { | |
type Item = (&'a GenericByteViewArray<T>, usize); | ||
|
||
fn is_eq(l: Self::Item, r: Self::Item) -> bool { | ||
let l_view = unsafe { l.0.views().get_unchecked(l.1) }; | ||
let r_view = unsafe { r.0.views().get_unchecked(r.1) }; | ||
if l.0.data_buffers().is_empty() && r.0.data_buffers().is_empty() { | ||
// Only need to compare the inlined bytes | ||
let l_bytes = unsafe { GenericByteViewArray::<T>::inline_value(l_view, 12) }; | ||
let r_bytes = unsafe { GenericByteViewArray::<T>::inline_value(r_view, 12) }; | ||
return l_bytes.cmp(r_bytes).is_eq(); | ||
} | ||
|
||
// # Safety | ||
// The index is within bounds as it is checked in value() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: I think it would be good to move the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you @alamb for review, addressed it in latest PR. |
||
let l_view = unsafe { l.0.views().get_unchecked(l.1) }; | ||
let l_len = *l_view as u32; | ||
|
||
let r_view = unsafe { r.0.views().get_unchecked(r.1) }; | ||
let r_len = *r_view as u32; | ||
// This is a fast path for equality check. | ||
// We don't need to look at the actual bytes to determine if they are equal. | ||
|
@@ -585,6 +591,16 @@ impl<'a, T: ByteViewType> ArrayOrd for &'a GenericByteViewArray<T> { | |
fn is_lt(l: Self::Item, r: Self::Item) -> bool { | ||
// # Safety | ||
// The index is within bounds as it is checked in value() | ||
if l.0.data_buffers().is_empty() && r.0.data_buffers().is_empty() { | ||
// Only need to compare the inlined bytes | ||
let l_bytes = unsafe { | ||
GenericByteViewArray::<T>::inline_value(l.0.views().get_unchecked(l.1), 12) | ||
}; | ||
let r_bytes = unsafe { | ||
GenericByteViewArray::<T>::inline_value(r.0.views().get_unchecked(r.1), 12) | ||
}; | ||
return l_bytes.cmp(r_bytes).is_lt(); | ||
} | ||
unsafe { GenericByteViewArray::compare_unchecked(l.0, l.1, r.0, r.1).is_lt() } | ||
} | ||
|
||
|
@@ -626,6 +642,16 @@ pub fn compare_byte_view<T: ByteViewType>( | |
) -> std::cmp::Ordering { | ||
assert!(left_idx < left.len()); | ||
assert!(right_idx < right.len()); | ||
if left.data_buffers().is_empty() && right.data_buffers().is_empty() { | ||
// Only need to compare the inlined bytes | ||
let l_bytes = unsafe { | ||
GenericByteViewArray::<T>::inline_value(left.views().get_unchecked(left_idx), 12) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm I think this might not be correct for > / < in case of zeros in the values (e.g. https://en.wikipedia.org/wiki/Null_character). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This returns greater (instead of Equal):
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point @Dandandan , let me find a good way to handle it! |
||
}; | ||
let r_bytes = unsafe { | ||
GenericByteViewArray::<T>::inline_value(right.views().get_unchecked(right_idx), 12) | ||
}; | ||
return l_bytes.cmp(r_bytes); | ||
} | ||
unsafe { GenericByteViewArray::compare_unchecked(left, left_idx, right, right_idx) } | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the code probably depends on inlining / moving this check outside of the loop?
Should we add
#[inline(always)]
to it to make sure it keeps doing that? 🤔There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @Dandandan for this good suggestion, i addressed it in latest PR.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I add the #[inline(always)] to eq(), lt() and compare_byte_view(), i am sure if it's the right way.