martijn12358/aoc2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aoc4

Browse Source
This commit is contained in:
Martijn Gerritsen 2025-12-08 16:43:00 +01:00
parent 6465a1597a
commit f22f67161b
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benches/bench_aoc_4.rs
View File

@ -16,7 +16,7 @@ fn bench_aoc_4_part2(c: &mut Criterion) {
} }
fn bench_aoc_4_part2_f(c: &mut Criterion) { fn bench_aoc_4_part2_f(c: &mut Criterion) {
let input = black_box(include_bytes!("../src/aoc/input/full_input_aoc4.txt")); let input = black_box(include_bytes!("../src/aoc/input/full_input_aoc4.txt"));
c.bench_function("bench_aoc4 part 2", |b| b.iter(|| aoc_4::solve_p2_f(input))); c.bench_function("bench_aoc4 part 2 fast", |b| b.iter(|| aoc_4::solve_p2_f(input)));
} }
criterion_group!( criterion_group!(

37
src/aoc/aoc_4.rs
View File

@ -1,3 +1,4 @@
use std::simd::prelude::*; use std::simd::prelude::*;
pub fn solve_p1(input: &[u8]) -> u64 { pub fn solve_p1(input: &[u8]) -> u64 {
let mut answer = 0; let mut answer = 0;
@ -68,11 +69,16 @@ pub fn solve_p1_f(input: &[u8]) -> u64 {
const LANES: usize = 8; const LANES: usize = 8;
type SimdVec = Simd<u8, LANES>; type SimdVec = Simd<u8, LANES>;
let mut data = [0;8];
let offsets = usizex8::from_array([0, 1, 2, 140, 142, 240, 241, 242]);
for i in len+1..input.len()-len-1 { for i in len+1..input.len()-len-1 {
if input[i] == b'@' { if input[i] == b'@' {
let data= [input[i-1], input[i+1], input[i+len], input[i +len+1], input[i+len-1], input[i-(len+1)], input[i-(len -1)], input[i-len]]; data= [input[i-1], input[i+1], input[i+len], input[i +len +1], input[i+len -1], input[i-len], input[i -(len +1)], input[i-(len -1)]];
let (pre, chk, post) = data.as_simd(); let chk = SimdVec::from_array(data);
let count = chk[0].simd_eq(target).to_bitmask().count_ones(); let count = chk.simd_eq(target).to_bitmask().count_ones();
//let count = vals.simd_eq(target).to_bitmask().count_ones();
if count <4 { if count <4 {
answer += 1; answer += 1;
} }
@ -80,9 +86,9 @@ pub fn solve_p1_f(input: &[u8]) -> u64 {
} }
for i in 1..len { for i in 1..len {
if input[i] == b'@' { if input[i] == b'@' {
let data= [input[i-1], input[i+1], input[i+len], input[i +len +1], input[i+len -1], 0,0,0]; data= [input[i-1], input[i+1], input[i+len], input[i +len +1], input[i+len -1], 0,0,0];
let (pre, chk, post) = data.as_simd(); let chk = SimdVec::from_array(data);
let count = chk[0].simd_eq(target).to_bitmask().count_ones(); let count = chk.simd_eq(target).to_bitmask().count_ones();
if count <4 { if count <4 {
answer += 1; answer += 1;
} }
@ -90,9 +96,9 @@ pub fn solve_p1_f(input: &[u8]) -> u64 {
} }
for i in input.len()-len..input.len()-1 { for i in input.len()-len..input.len()-1 {
if input[i] == b'@' { if input[i] == b'@' {
let data= [input[i-1], input[i+1], input[i-len], input[i -(len +1)], input[i-(len-1)], 0,0,0]; data= [input[i-1], input[i+1], input[i-len], input[i -(len +1)], input[i-(len-1)], 0,0,0];
let (pre, chk, post) = data.as_simd(); let chk = SimdVec::from_array(data);
let count = chk[0].simd_eq(target).to_bitmask().count_ones(); let count = chk.simd_eq(target).to_bitmask().count_ones();
if count <4 { if count <4 {
answer += 1; answer += 1;
@ -100,9 +106,9 @@ pub fn solve_p1_f(input: &[u8]) -> u64 {
} }
} }
if input[len] == b'@' { if input[len] == b'@' {
let data= [input[len-1], input[len+1], input[0], 0, input[1], 0,0,0]; data= [input[len-1], input[len+1], input[0], 0, input[1], 0,0,0];
let (pre, chk, post) = data.as_simd(); let chk = SimdVec::from_array(data);
let count = chk[0].simd_eq(target).to_bitmask().count_ones(); let count = chk.simd_eq(target).to_bitmask().count_ones();
if count <4 { if count <4 {
answer += 1; answer += 1;
@ -110,9 +116,9 @@ pub fn solve_p1_f(input: &[u8]) -> u64 {
} }
let idx = input.len()-len -1; let idx = input.len()-len -1;
if input[idx] == b'@' { if input[idx] == b'@' {
let data= [input[idx-1], 0, input[idx - len], input[idx + len], input[idx - (len + 1)], input[idx + (len -1)],0,0]; data= [input[idx-1], 0, input[idx - len], input[idx + len], input[idx - (len + 1)], input[idx + (len -1)],0,0];
let (pre, chk, post) = data.as_simd(); let chk = SimdVec::from_array(data);
let count = chk[0].simd_eq(target).to_bitmask().count_ones(); let count = chk.simd_eq(target).to_bitmask().count_ones();
if count <4 { if count <4 {
answer += 1; answer += 1;
@ -127,6 +133,7 @@ pub fn solve_p1_f(input: &[u8]) -> u64 {
answer answer
} }
pub fn solve_p2(input: &str) -> u16 { pub fn solve_p2(input: &str) -> u16 {
let mut answer = 0; let mut answer = 0;
let mut data:Vec<Vec<char>> = Vec::with_capacity(256); let mut data:Vec<Vec<char>> = Vec::with_capacity(256);