@@ -373,12 +373,12 @@ fn muladd_2d_f32_blas(bench: &mut test::Bencher)
373
373
}
374
374
375
375
#[ bench]
376
- fn assign_scalar_2d_large ( bench : & mut test:: Bencher )
376
+ fn assign_scalar_2d_corder ( bench : & mut test:: Bencher )
377
377
{
378
378
let a = OwnedArray :: zeros ( ( 64 , 64 ) ) ;
379
379
let mut a = black_box ( a) ;
380
380
let s = 3. ;
381
- bench. iter ( || a. assign_scalar ( & s) )
381
+ bench. iter ( move || a. assign_scalar ( & s) )
382
382
}
383
383
384
384
#[ bench]
@@ -388,26 +388,43 @@ fn assign_scalar_2d_cutout(bench: &mut test::Bencher)
388
388
let a = a. slice_mut ( s ! [ 1 ..-1 , 1 ..-1 ] ) ;
389
389
let mut a = black_box ( a) ;
390
390
let s = 3. ;
391
- bench. iter ( || a. assign_scalar ( & s) )
391
+ bench. iter ( move || a. assign_scalar ( & s) )
392
392
}
393
393
394
394
#[ bench]
395
- fn assign_scalar_2d_transposed_large ( bench : & mut test:: Bencher )
395
+ fn assign_scalar_2d_forder ( bench : & mut test:: Bencher )
396
396
{
397
397
let mut a = OwnedArray :: zeros ( ( 64 , 64 ) ) ;
398
398
a. swap_axes ( 0 , 1 ) ;
399
399
let mut a = black_box ( a) ;
400
400
let s = 3. ;
401
- bench. iter ( || a. assign_scalar ( & s) )
401
+ bench. iter ( move || a. assign_scalar ( & s) )
402
402
}
403
403
404
404
#[ bench]
405
- fn assign_scalar_2d_raw_large ( bench : & mut test:: Bencher )
405
+ fn assign_zero_2d_corder ( bench : & mut test:: Bencher )
406
406
{
407
407
let a = OwnedArray :: zeros ( ( 64 , 64 ) ) ;
408
408
let mut a = black_box ( a) ;
409
- let s = 3. ;
410
- bench. iter ( || for elt in a. raw_data_mut ( ) { * elt = s; } ) ;
409
+ bench. iter ( || a. assign_scalar ( & 0. ) )
410
+ }
411
+
412
+ #[ bench]
413
+ fn assign_zero_2d_cutout ( bench : & mut test:: Bencher )
414
+ {
415
+ let mut a = OwnedArray :: zeros ( ( 66 , 66 ) ) ;
416
+ let a = a. slice_mut ( s ! [ 1 ..-1 , 1 ..-1 ] ) ;
417
+ let mut a = black_box ( a) ;
418
+ bench. iter ( || a. assign_scalar ( & 0. ) )
419
+ }
420
+
421
+ #[ bench]
422
+ fn assign_zero_2d_forder ( bench : & mut test:: Bencher )
423
+ {
424
+ let mut a = OwnedArray :: zeros ( ( 64 , 64 ) ) ;
425
+ a. swap_axes ( 0 , 1 ) ;
426
+ let mut a = black_box ( a) ;
427
+ bench. iter ( || a. assign_scalar ( & 0. ) )
411
428
}
412
429
413
430
#[ bench]
0 commit comments