Skip to content

Add NaN handling in dyn scalar comparison kernels #2830

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Oct 6, 2022
Merged

Add NaN handling in dyn scalar comparison kernels #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b53d4a1
Add NaN handling in dyn scalar comparison kernels
viirya Oct 6, 2022
1780feb
Use trait
viirya Oct 6, 2022
7e50b14
Fix clippy
viirya Oct 6, 2022
ce487af
Prepare for simd and non-simd tests
viirya Oct 6, 2022
43173e4
Restore flight protocal files.
viirya Oct 6, 2022
10b3eec
Use ArrowNativeTypeOp as type bound
viirya Oct 6, 2022
ea1e7a8
Remove num::ToPrimitive addition
viirya Oct 6, 2022
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
74 changes: 25 additions & 49 deletions arrow/benches/comparison_kernels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,83 +33,41 @@ where
eq(criterion::black_box(arr_a), criterion::black_box(arr_b)).unwrap();
}

fn bench_eq_scalar<T>(arr_a: &PrimitiveArray<T>, value_b: T::Native)
where
T: ArrowNumericType,
{
eq_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}

fn bench_neq<T>(arr_a: &PrimitiveArray<T>, arr_b: &PrimitiveArray<T>)
where
T: ArrowNumericType,
{
neq(criterion::black_box(arr_a), criterion::black_box(arr_b)).unwrap();
}

fn bench_neq_scalar<T>(arr_a: &PrimitiveArray<T>, value_b: T::Native)
where
T: ArrowNumericType,
{
neq_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}

fn bench_lt<T>(arr_a: &PrimitiveArray<T>, arr_b: &PrimitiveArray<T>)
where
T: ArrowNumericType,
{
lt(criterion::black_box(arr_a), criterion::black_box(arr_b)).unwrap();
}

fn bench_lt_scalar<T>(arr_a: &PrimitiveArray<T>, value_b: T::Native)
where
T: ArrowNumericType,
{
lt_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}

fn bench_lt_eq<T>(arr_a: &PrimitiveArray<T>, arr_b: &PrimitiveArray<T>)
where
T: ArrowNumericType,
{
lt_eq(criterion::black_box(arr_a), criterion::black_box(arr_b)).unwrap();
}

fn bench_lt_eq_scalar<T>(arr_a: &PrimitiveArray<T>, value_b: T::Native)
where
T: ArrowNumericType,
{
lt_eq_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}

fn bench_gt<T>(arr_a: &PrimitiveArray<T>, arr_b: &PrimitiveArray<T>)
where
T: ArrowNumericType,
{
gt(criterion::black_box(arr_a), criterion::black_box(arr_b)).unwrap();
}

fn bench_gt_scalar<T>(arr_a: &PrimitiveArray<T>, value_b: T::Native)
where
T: ArrowNumericType,
{
gt_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}

fn bench_gt_eq<T>(arr_a: &PrimitiveArray<T>, arr_b: &PrimitiveArray<T>)
where
T: ArrowNumericType,
{
gt_eq(criterion::black_box(arr_a), criterion::black_box(arr_b)).unwrap();
}

fn bench_gt_eq_scalar<T>(arr_a: &PrimitiveArray<T>, value_b: T::Native)
where
T: ArrowNumericType,
{
gt_eq_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}

fn bench_like_utf8_scalar(arr_a: &StringArray, value_b: &str) {
like_utf8_scalar(criterion::black_box(arr_a), criterion::black_box(value_b)).unwrap();
}
Expand Down Expand Up @@ -164,39 +122,57 @@ fn add_benchmark(c: &mut Criterion) {

c.bench_function("eq Float32", |b| b.iter(|| bench_eq(&arr_a, &arr_b)));
c.bench_function("eq scalar Float32", |b| {
b.iter(|| bench_eq_scalar(&arr_a, 1.0))
b.iter(|| {
eq_scalar(criterion::black_box(&arr_a), criterion::black_box(1.0)).unwrap()
})
});

c.bench_function("neq Float32", |b| b.iter(|| bench_neq(&arr_a, &arr_b)));
c.bench_function("neq scalar Float32", |b| {
b.iter(|| bench_neq_scalar(&arr_a, 1.0))
b.iter(|| {
neq_scalar(criterion::black_box(&arr_a), criterion::black_box(1.0)).unwrap()
})
});

c.bench_function("lt Float32", |b| b.iter(|| bench_lt(&arr_a, &arr_b)));
c.bench_function("lt scalar Float32", |b| {
b.iter(|| bench_lt_scalar(&arr_a, 1.0))
b.iter(|| {
lt_scalar(criterion::black_box(&arr_a), criterion::black_box(1.0)).unwrap()
})
});

c.bench_function("lt_eq Float32", |b| b.iter(|| bench_lt_eq(&arr_a, &arr_b)));
c.bench_function("lt_eq scalar Float32", |b| {
b.iter(|| bench_lt_eq_scalar(&arr_a, 1.0))
b.iter(|| {
lt_eq_scalar(criterion::black_box(&arr_a), criterion::black_box(1.0)).unwrap()
})
});

c.bench_function("gt Float32", |b| b.iter(|| bench_gt(&arr_a, &arr_b)));
c.bench_function("gt scalar Float32", |b| {
b.iter(|| bench_gt_scalar(&arr_a, 1.0))
b.iter(|| {
gt_scalar(criterion::black_box(&arr_a), criterion::black_box(1.0)).unwrap()
})
});

c.bench_function("gt_eq Float32", |b| b.iter(|| bench_gt_eq(&arr_a, &arr_b)));
c.bench_function("gt_eq scalar Float32", |b| {
b.iter(|| bench_gt_eq_scalar(&arr_a, 1.0))
b.iter(|| {
gt_eq_scalar(criterion::black_box(&arr_a), criterion::black_box(1.0)).unwrap()
})
});

c.bench_function("eq MonthDayNano", |b| {
b.iter(|| bench_eq(&arr_month_day_nano_a, &arr_month_day_nano_b))
});
c.bench_function("eq scalar MonthDayNano", |b| {
b.iter(|| bench_eq_scalar(&arr_month_day_nano_a, 123))
b.iter(|| {
eq_scalar(
criterion::black_box(&arr_month_day_nano_a),
criterion::black_box(123),
)
.unwrap()
})
});

c.bench_function("like_utf8 scalar equals", |b| {
Expand Down
Loading