Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/align/simd_scan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ pub fn find_stop(read: &[u8], genome: &[u8]) -> Option<usize> {
debug_assert_eq!(read.len(), genome.len());

let mut base = 0usize;
let mut r_chunks = read.chunks_exact(16);
let mut g_chunks = genome.chunks_exact(16);
while let (Some(rc), Some(gc)) = (r_chunks.next(), g_chunks.next()) {
let rc: &[u8; 16] = rc.try_into().unwrap();
let gc: &[u8; 16] = gc.try_into().unwrap();
let (r_chunks, r_rem) = read.as_chunks::<16>();
let (g_chunks, g_rem) = genome.as_chunks::<16>();
for (rc, gc) in r_chunks.iter().zip(g_chunks) {
if !chunk_all_match(rc, gc) {
for k in 0..16 {
if gc[k] >= 5 || rc[k] != gc[k] {
Expand All @@ -45,8 +43,6 @@ pub fn find_stop(read: &[u8], genome: &[u8]) -> Option<usize> {
}

// Tail shorter than 16 bytes: plain scalar scan.
let r_rem = r_chunks.remainder();
let g_rem = g_chunks.remainder();
for (k, (&r, &g)) in r_rem.iter().zip(g_rem.iter()).enumerate() {
if g >= 5 || r != g {
return Some(base + k);
Expand Down
7 changes: 6 additions & 1 deletion src/bam_dedup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,12 @@ fn collapse_group(recs: &mut [DedupRec], group: &[usize], mate2_bases_n: u32) ->
.then_with(|| (ra.flag & 0x80).cmp(&(rb.flag & 0x80)))
});
// Pairs of adjacent (mate1, mate2) indices.
let mut pairs: Vec<(usize, usize)> = sorted.chunks_exact(2).map(|c| (c[0], c[1])).collect();
let mut pairs: Vec<(usize, usize)> = sorted
.as_chunks::<2>()
.0
.iter()
.map(|&[m1, m2]| (m1, m2))
.collect();
// Sort pairs by the coordinate/flag/CIGAR key.
pairs.sort_by(|&(a1, a2), &(b1, b2)| {
cmp_pair(&recs[a1], &recs[a2], &recs[b1], &recs[b2], mate2_bases_n)
Expand Down
2 changes: 1 addition & 1 deletion src/quant/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ impl GeneAnnotation {
out.push(chr[nlo].2);
continue;
}
let mid = (nlo + nhi) >> 1;
let mid = usize::midpoint(nlo, nhi);
stack[sp] = (2 * node, nlo, mid);
sp += 1;
stack[sp] = (2 * node + 1, mid, nhi);
Expand Down
Loading