@@ -83,51 +83,11 @@ mod primitive {
8383 use vortex_array:: dtype:: NativePType ;
8484 use vortex_array:: scalar_fn:: fns:: between:: BetweenOptions ;
8585 use vortex_array:: scalar_fn:: fns:: between:: StrictComparison :: NonStrict ;
86- use vortex_array:: scalar_fn:: fns:: operators:: Operator ;
8786 use vortex_error:: VortexExpect ;
8887
8988 use crate :: BENCH_ARGS ;
9089 use crate :: generate_primitive_array;
9190
92- #[ divan:: bench(
93- types = [ i32 , i64 , u32 , u64 , f32 , f64 ] ,
94- args = BENCH_ARGS ,
95- ) ]
96- fn old_raw_prim_test_between < T > ( bencher : Bencher , len : usize )
97- where
98- T : NumCast + NativePType ,
99- vortex_array:: scalar:: Scalar : From < T > ,
100- {
101- let min = T :: from_usize ( 5561 ) . vortex_expect ( "" ) ;
102- let max = T :: from_usize ( 6032 ) . vortex_expect ( "" ) ;
103- let mut rng = StdRng :: seed_from_u64 ( 0 ) ;
104- let arr = generate_primitive_array :: < T > ( & mut rng, len) ;
105-
106- bencher
107- . with_inputs ( || ( & arr, LEGACY_SESSION . create_execution_ctx ( ) ) )
108- . bench_refs ( |( arr, ctx) | {
109- let gte = arr
110- . clone ( )
111- . into_array ( )
112- . binary (
113- ConstantArray :: new ( min, arr. len ( ) ) . into_array ( ) ,
114- Operator :: Gte ,
115- )
116- . vortex_expect ( "" ) ;
117- let lt = arr
118- . clone ( )
119- . into_array ( )
120- . binary (
121- ConstantArray :: new ( max, arr. len ( ) ) . into_array ( ) ,
122- Operator :: Lt ,
123- )
124- . vortex_expect ( "" ) ;
125- gte. binary ( lt, Operator :: And )
126- . vortex_expect ( "" )
127- . execute :: < RecursiveCanonical > ( ctx)
128- } )
129- }
130-
13191 #[ divan:: bench(
13292 types = [ i32 , i64 , u32 , u64 , f32 , f64 ] ,
13393 args = BENCH_ARGS ,
@@ -176,50 +136,11 @@ mod bitpack {
176136 use vortex_array:: dtype:: NativePType ;
177137 use vortex_array:: scalar_fn:: fns:: between:: BetweenOptions ;
178138 use vortex_array:: scalar_fn:: fns:: between:: StrictComparison :: NonStrict ;
179- use vortex_array:: scalar_fn:: fns:: operators:: Operator ;
180139 use vortex_error:: VortexExpect ;
181140
182141 use crate :: BENCH_ARGS ;
183142 use crate :: generate_bit_pack_primitive_array;
184143
185- #[ divan:: bench(
186- types = [ i16 , i32 , i64 ] ,
187- args = BENCH_ARGS ,
188- ) ]
189- fn old_bp_prim_test_between < T > ( bencher : Bencher , len : usize )
190- where
191- T : NumCast + NativePType ,
192- vortex_array:: scalar:: Scalar : From < T > ,
193- {
194- let min = T :: from_usize ( 5561 ) . vortex_expect ( "" ) ;
195- let max = T :: from_usize ( 6032 ) . vortex_expect ( "" ) ;
196- let mut rng = StdRng :: seed_from_u64 ( 0 ) ;
197- let arr = generate_bit_pack_primitive_array :: < T > ( & mut rng, len) ;
198-
199- bencher
200- . with_inputs ( || ( & arr, LEGACY_SESSION . create_execution_ctx ( ) ) )
201- . bench_refs ( |( arr, ctx) | {
202- let gte = arr
203- . clone ( )
204- . binary (
205- ConstantArray :: new ( min, arr. len ( ) ) . into_array ( ) ,
206- Operator :: Gte ,
207- )
208- . vortex_expect ( "" ) ;
209- let lt = arr
210- . clone ( )
211- . binary (
212- ConstantArray :: new ( max, arr. len ( ) ) . into_array ( ) ,
213- Operator :: Lt ,
214- )
215- . vortex_expect ( "" ) ;
216- gte. binary ( lt, Operator :: And )
217- . unwrap ( )
218- . execute :: < RecursiveCanonical > ( ctx)
219- . unwrap ( )
220- } )
221- }
222-
223144 #[ divan:: bench(
224145 types = [ i16 , i32 , i64 ] ,
225146 args = BENCH_ARGS ,
@@ -267,50 +188,11 @@ mod alp {
267188 use vortex_array:: dtype:: NativePType ;
268189 use vortex_array:: scalar_fn:: fns:: between:: BetweenOptions ;
269190 use vortex_array:: scalar_fn:: fns:: between:: StrictComparison :: NonStrict ;
270- use vortex_array:: scalar_fn:: fns:: operators:: Operator ;
271191 use vortex_error:: VortexExpect ;
272192
273193 use crate :: BENCH_ARGS ;
274194 use crate :: generate_alp_bit_pack_primitive_array;
275195
276- #[ divan:: bench(
277- types = [ f32 , f64 ] ,
278- args = BENCH_ARGS ,
279- ) ]
280- fn old_alp_prim_test_between < T > ( bencher : Bencher , len : usize )
281- where
282- T : NumCast + NativePType ,
283- vortex_array:: scalar:: Scalar : From < T > ,
284- {
285- let min = T :: from_usize ( 5561 ) . vortex_expect ( "" ) ;
286- let max = T :: from_usize ( 6032 ) . vortex_expect ( "" ) ;
287- let mut rng = StdRng :: seed_from_u64 ( 0 ) ;
288- let arr = generate_alp_bit_pack_primitive_array :: < T > ( & mut rng, len) ;
289-
290- bencher
291- . with_inputs ( || ( & arr, LEGACY_SESSION . create_execution_ctx ( ) ) )
292- . bench_refs ( |( arr, ctx) | {
293- let gte = arr
294- . clone ( )
295- . binary (
296- ConstantArray :: new ( min, arr. len ( ) ) . into_array ( ) ,
297- Operator :: Gte ,
298- )
299- . vortex_expect ( "" ) ;
300- let lt = arr
301- . clone ( )
302- . binary (
303- ConstantArray :: new ( max, arr. len ( ) ) . into_array ( ) ,
304- Operator :: Lt ,
305- )
306- . vortex_expect ( "" ) ;
307- gte. binary ( lt, Operator :: And )
308- . unwrap ( )
309- . execute :: < RecursiveCanonical > ( ctx)
310- . unwrap ( )
311- } )
312- }
313-
314196 #[ divan:: bench(
315197 types = [ f32 , f64 ] ,
316198 args = BENCH_ARGS ,
0 commit comments