@@ -489,173 +489,173 @@ TEST(auto_configure, many_ok_forward_compatibility) {
489
489
" 1 name1 1 name2 47 "
490
490
" 40 external_sort_stage_0 0 128 1 0 0 1 0 "
491
491
" 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 0 "
492
- " 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 800 "
492
+ " 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 800 "
493
493
" 40 external_sort_stage_1 256 128 1 0 0 1 "
494
494
" 0 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 "
495
- " 0 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 "
495
+ " 0 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 "
496
496
" 800 "
497
497
" 40 external_sort_stage_2 512 128 1 0 0 1 "
498
498
" 0 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 "
499
- " 0 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 "
499
+ " 0 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 "
500
500
" 800 "
501
501
" 40 external_sort_stage_3 768 128 1 0 0 1 "
502
502
" 0 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 "
503
- " 0 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 "
503
+ " 0 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 "
504
504
" 800 "
505
505
" 40 external_sort_stage_4 1024 128 1 0 0 1 "
506
506
" 0 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 "
507
- " 0 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 "
507
+ " 0 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 "
508
508
" 800 "
509
509
" 40 external_sort_stage_5 1280 128 1 0 0 1 "
510
510
" 0 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 "
511
- " 0 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 "
511
+ " 0 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 "
512
512
" 800 "
513
513
" 40 external_sort_stage_6 1536 128 1 0 0 1 "
514
514
" 0 1 0 1 10 0 0 4 1 0 0 0 500 500 500 0 "
515
- " 0 0 0 1 1 1 3 1 1 1 3 1 0 800 800 800 "
515
+ " 0 0 0 1 1 1 3 1 1 1 3 1 0 0 800 800 "
516
516
" 800 "
517
517
" 38 external_stream_writer0 1792 256 1 0 0 "
518
518
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
519
519
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
520
- " 800 800 800 800 "
520
+ " 0 800 800 800 "
521
521
" 38 external_stream_writer1 2048 256 1 0 0 "
522
522
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
523
523
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
524
- " 800 800 800 800 "
524
+ " 0 800 800 800 "
525
525
" 38 external_stream_writer2 2304 256 1 0 0 "
526
526
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
527
527
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
528
- " 800 800 800 800 "
528
+ " 0 800 800 800 "
529
529
" 38 external_stream_writer3 2560 256 1 0 0 "
530
530
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
531
531
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
532
- " 800 800 800 800 "
532
+ " 0 800 800 800 "
533
533
" 38 external_stream_writer4 2816 256 1 0 0 "
534
534
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
535
535
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
536
- " 800 800 800 800 "
536
+ " 0 800 800 800 "
537
537
" 38 external_stream_writer5 3072 256 1 0 0 "
538
538
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
539
539
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
540
- " 800 800 800 800 "
540
+ " 0 800 800 800 "
541
541
" 38 external_stream_writer6 3328 256 1 0 0 "
542
542
" 0 0 1 0 1 10 2 1 8 1024 0 0 0 500 500 "
543
543
" 500 0 0 0 0 0 0 0 1 2147483647 3 1 0 "
544
- " 800 800 800 800 "
544
+ " 0 800 800 800 "
545
545
" 38 input_reader 3584 256 1 0 0 0 0 1 0 1 "
546
546
" 10 2 1 8 1024 0 0 0 500 500 500 0 0 0 0 "
547
- " 0 0 0 1 2147483647 3 1 0 800 800 800 "
547
+ " 0 0 0 1 2147483647 3 1 0 0 800 800 "
548
548
" 800 "
549
549
" 38 output_writer 3840 256 1 0 0 0 0 1 0 1 "
550
550
" 10 2 1 8 1024 0 0 0 500 500 500 0 0 0 0 "
551
- " 0 0 0 1 2147483647 3 1 0 800 800 800 "
551
+ " 0 0 0 1 2147483647 3 1 0 0 800 800 "
552
552
" 800 "
553
553
" 40 sort_stage_1 4096 128 1 0 0 1 0 1 0 1 "
554
554
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
555
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
555
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
556
556
" 40 sort_stage_10 4352 128 1 0 0 1 0 1 0 1 "
557
557
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
558
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
558
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
559
559
" 40 sort_stage_11 4608 128 1 0 0 1 0 1 0 1 "
560
560
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
561
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
561
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
562
562
" 40 sort_stage_12 4864 128 1 0 0 1 0 1 0 1 "
563
563
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
564
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
564
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
565
565
" 40 sort_stage_13 5120 128 1 0 0 1 0 1 0 1 "
566
566
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
567
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
567
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
568
568
" 40 sort_stage_14 5376 128 1 0 0 1 0 1 0 1 "
569
569
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
570
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
570
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
571
571
" 40 sort_stage_15 5632 128 1 0 0 1 0 1 0 1 "
572
572
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
573
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
573
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
574
574
" 40 sort_stage_16 5888 128 1 0 0 1 0 1 0 1 "
575
575
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
576
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
576
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
577
577
" 40 sort_stage_17 6144 128 1 0 0 1 0 1 0 1 "
578
578
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
579
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
579
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
580
580
" 40 sort_stage_2 6400 128 1 0 0 1 0 1 0 1 "
581
581
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
582
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
582
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
583
583
" 40 sort_stage_3 6656 128 1 0 0 1 0 1 0 1 "
584
584
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
585
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
585
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
586
586
" 40 sort_stage_4 6912 128 1 0 0 1 0 1 0 1 "
587
587
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
588
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
588
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
589
589
" 40 sort_stage_5 7168 128 1 0 0 1 0 1 0 1 "
590
590
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
591
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
591
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
592
592
" 40 sort_stage_6 7424 128 1 0 0 1 0 1 0 1 "
593
593
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
594
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
594
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
595
595
" 40 sort_stage_7 7680 128 1 0 0 1 0 1 0 1 "
596
596
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
597
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
597
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
598
598
" 40 sort_stage_8 7936 128 1 0 0 1 0 1 0 1 "
599
599
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
600
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
600
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
601
601
" 40 sort_stage_9 8192 128 1 0 0 1 0 1 0 1 "
602
602
" 10 0 0 4 1 0 0 0 500 500 500 0 0 0 0 1 "
603
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 "
603
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 "
604
604
" 38 stream_reader_A0 8448 256 1 0 0 0 0 1 "
605
605
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
606
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
606
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
607
607
" 800 800 "
608
608
" 38 stream_reader_A1 8704 256 1 0 0 0 0 1 "
609
609
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
610
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
610
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
611
611
" 800 800 "
612
612
" 38 stream_reader_A2 8960 256 1 0 0 0 0 1 "
613
613
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
614
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
614
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
615
615
" 800 800 "
616
616
" 38 stream_reader_A3 9216 256 1 0 0 0 0 1 "
617
617
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
618
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
618
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
619
619
" 800 800 "
620
620
" 38 stream_reader_A4 9472 256 1 0 0 0 0 1 "
621
621
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
622
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
622
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
623
623
" 800 800 "
624
624
" 38 stream_reader_A5 9728 256 1 0 0 0 0 1 "
625
625
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
626
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
626
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
627
627
" 800 800 "
628
628
" 38 stream_reader_A6 9984 256 1 0 0 0 0 1 "
629
629
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
630
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
630
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
631
631
" 800 800 "
632
632
" 38 stream_reader_B0 10240 256 1 0 0 0 0 1 "
633
633
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
634
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
634
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
635
635
" 800 800 "
636
636
" 38 stream_reader_B1 10496 256 1 0 0 0 0 1 "
637
637
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
638
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
638
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
639
639
" 800 800 "
640
640
" 38 stream_reader_B2 10752 256 1 0 0 0 0 1 "
641
641
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
642
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
642
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
643
643
" 800 800 "
644
644
" 38 stream_reader_B3 11008 256 1 0 0 0 0 1 "
645
645
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
646
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
646
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
647
647
" 800 800 "
648
648
" 38 stream_reader_B4 11264 256 1 0 0 0 0 1 "
649
649
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
650
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
650
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
651
651
" 800 800 "
652
652
" 38 stream_reader_B5 11520 256 1 0 0 0 0 1 "
653
653
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
654
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
654
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
655
655
" 800 800 "
656
656
" 38 stream_reader_B6 11776 256 1 0 0 0 0 1 "
657
657
" 0 1 10 2 1 8 1024 0 0 0 500 500 500 0 0 "
658
- " 0 0 0 0 0 1 2147483647 3 1 0 800 800 "
658
+ " 0 0 0 0 0 1 2147483647 3 1 0 0 800 "
659
659
" 800 800 900 900 900 900 900" );
660
660
661
661
std::vector<acl_device_def_t > device_defs (ACL_MAX_DEVICE);
@@ -1202,7 +1202,7 @@ TEST(auto_configure, hostpipe) {
1202
1202
" 300 dev_to_host 0 1 32 32768 300 300 300 "
1203
1203
" 300 400 1 3 name3 400 0 "
1204
1204
" 1 29 foo 0 128 1 0 0 1 0 1 0 0 0 0 0 0 1 "
1205
- " 1 1 3 1 1 1 3 1 0 800 800 800 800 900 "
1205
+ " 1 1 3 1 1 1 3 1 0 0 800 800 800 900 "
1206
1206
" 900"
1207
1207
1208
1208
);
0 commit comments