-
Notifications
You must be signed in to change notification settings - Fork 839
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
Add unpack8, unpack16, unpack64 (#2276) ~10-50% faster #2278
Changes from all commits
fd82128
612cc1d
f5edaad
5ee4a48
2f43617
8c39265
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 |
---|---|---|
@@ -0,0 +1,138 @@ | ||
// Licensed to the Apache Software Foundation (ASF) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The ASF licenses this file | ||
// to you under the Apache License, Version 2.0 (the | ||
// "License"); you may not use this file except in compliance | ||
// with the License. You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
//! Vectorised bit-packing utilities | ||
|
||
/// Macro that generates an unpack function taking the number of bits as a const generic | ||
macro_rules! unpack_impl { | ||
($t:ty, $bytes:literal, $bits:tt) => { | ||
pub fn unpack<const NUM_BITS: usize>(input: &[u8], output: &mut [$t; $bits]) { | ||
if NUM_BITS == 0 { | ||
for out in output { | ||
*out = 0; | ||
} | ||
return; | ||
} | ||
|
||
assert!(NUM_BITS <= $bytes * 8); | ||
|
||
let mask = match NUM_BITS { | ||
$bits => <$t>::MAX, | ||
_ => ((1 << NUM_BITS) - 1), | ||
}; | ||
|
||
assert!(input.len() >= NUM_BITS * $bytes); | ||
|
||
let r = |output_idx: usize| { | ||
<$t>::from_le_bytes( | ||
input[output_idx * $bytes..output_idx * $bytes + $bytes] | ||
.try_into() | ||
.unwrap(), | ||
) | ||
}; | ||
|
||
seq_macro::seq!(i in 0..$bits { | ||
let start_bit = i * NUM_BITS; | ||
let end_bit = start_bit + NUM_BITS; | ||
|
||
let start_bit_offset = start_bit % $bits; | ||
let end_bit_offset = end_bit % $bits; | ||
let start_byte = start_bit / $bits; | ||
let end_byte = end_bit / $bits; | ||
if start_byte != end_byte && end_bit_offset != 0 { | ||
let val = r(start_byte); | ||
let a = val >> start_bit_offset; | ||
let val = r(end_byte); | ||
let b = val << (NUM_BITS - end_bit_offset); | ||
|
||
output[i] = a | (b & mask); | ||
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. I wonder if we could somehow remove 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. As output is a fixed length slice, the bounds check is automatically elided 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. ah good call, I was confusing that with |
||
} else { | ||
let val = r(start_byte); | ||
output[i] = (val >> start_bit_offset) & mask; | ||
} | ||
}); | ||
} | ||
}; | ||
} | ||
|
||
/// Macro that generates unpack functions that accept num_bits as a parameter | ||
macro_rules! unpack { | ||
($name:ident, $t:ty, $bytes:literal, $bits:tt) => { | ||
mod $name { | ||
unpack_impl!($t, $bytes, $bits); | ||
} | ||
|
||
/// Unpack packed `input` into `output` with a bit width of `num_bits` | ||
pub fn $name(input: &[u8], output: &mut [$t; $bits], num_bits: usize) { | ||
// This will get optimised into a jump table | ||
seq_macro::seq!(i in 0..=$bits { | ||
if i == num_bits { | ||
return $name::unpack::<i>(input, output); | ||
} | ||
}); | ||
unreachable!("invalid num_bits {}", num_bits); | ||
} | ||
}; | ||
} | ||
|
||
unpack!(unpack8, u8, 1, 8); | ||
unpack!(unpack16, u16, 2, 16); | ||
unpack!(unpack32, u32, 4, 32); | ||
unpack!(unpack64, u64, 8, 64); | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
use rand::{thread_rng, Rng}; | ||
|
||
#[test] | ||
fn test_basic() { | ||
let input = [0xFF; 4096]; | ||
|
||
for i in 0..=8 { | ||
let mut output = [0; 8]; | ||
unpack8(&input, &mut output, i); | ||
for (idx, out) in output.iter().enumerate() { | ||
assert_eq!(out.trailing_ones() as usize, i, "out[{}] = {}", idx, out); | ||
} | ||
} | ||
|
||
for i in 0..=16 { | ||
let mut output = [0; 16]; | ||
unpack16(&input, &mut output, i); | ||
for (idx, out) in output.iter().enumerate() { | ||
assert_eq!(out.trailing_ones() as usize, i, "out[{}] = {}", idx, out); | ||
} | ||
} | ||
|
||
for i in 0..=32 { | ||
let mut output = [0; 32]; | ||
unpack32(&input, &mut output, i); | ||
for (idx, out) in output.iter().enumerate() { | ||
assert_eq!(out.trailing_ones() as usize, i, "out[{}] = {}", idx, out); | ||
} | ||
} | ||
|
||
for i in 0..=64 { | ||
let mut output = [0; 64]; | ||
unpack64(&input, &mut output, i); | ||
for (idx, out) in output.iter().enumerate() { | ||
assert_eq!(out.trailing_ones() as usize, i, "out[{}] = {}", idx, out); | ||
} | ||
} | ||
} | ||
} |
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.
👍 when the original version was written const generic is not stabilized yet.