Attempt to improve merge_group job performance

[ctz]

No description provided.

[rustls-benchmarking]

Benchmark results

Instruction counts

Significant differences

There are no significant instruction count differences

Other differences

Click to expand

Scenario	Baseline	Candidate	Diff	Threshold
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server	4102996	4014523	-88473 (-2.16%)	3.90%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server	4550533	4499956	-50577 (-1.11%)	3.09%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server	12638408	12718457	80049 (0.63%)	0.88%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client	4521066	4504687	-16379 (-0.36%)	0.85%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server	12267703	12302795	35092 (0.29%)	0.94%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server	32536805	32468314	-68491 (-0.21%)	0.51%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client	30244136	30303175	59039 (0.20%)	0.36%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client	8671385	8658102	-13283 (-0.15%)	0.72%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server	32699131	32649063	-50068 (-0.15%)	0.67%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server	80483855	80370969	-112886 (-0.14%)	0.23%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server	2128715	2126116	-2599 (-0.12%)	0.36%
handshake_tickets_ring_1.2_rsa_aes_client	4705408	4700003	-5405 (-0.11%)	0.81%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client	8666623	8658158	-8465 (-0.10%)	0.91%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server	46270758	46315460	44702 (0.10%)	0.36%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server	32500513	32528888	28375 (0.09%)	0.52%
handshake_session_id_ring_1.2_rsa_aes_client	4443469	4439781	-3688 (-0.08%)	0.72%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client	30449755	30472810	23055 (0.08%)	0.28%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client	3344767	3342248	-2519 (-0.08%)	0.25%
handshake_session_id_ring_1.3_ecdsap256_chacha_server	43455346	43424609	-30737 (-0.07%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client	30472603	30492705	20102 (0.07%)	0.20%
handshake_tickets_ring_1.3_rsa_aes_client	42409678	42384191	-25487 (-0.06%)	0.20%
handshake_tickets_ring_1.2_rsa_aes_server	4761767	4759112	-2655 (-0.06%)	0.30%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server	32638769	32655519	16750 (0.05%)	0.27%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server	46204098	46227406	23308 (0.05%)	0.29%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client	30461830	30446969	-14861 (-0.05%)	0.43%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client	30649688	30664372	14684 (0.05%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_server	43740767	43760865	20098 (0.05%)	0.27%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server	1879921	1879072	-849 (-0.05%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_client	3895593	3897285	1692 (0.04%)	0.22%
handshake_session_id_ring_1.3_rsa_aes_client	42204484	42187045	-17439 (-0.04%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client	30449839	30462110	12271 (0.04%)	0.20%
handshake_session_id_ring_1.3_rsa_chacha_server	43455704	43438596	-17108 (-0.04%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server	1882942	1882222	-720 (-0.04%)	0.20%
handshake_session_id_ring_1.3_rsa_chacha_client	42134568	42118715	-15853 (-0.04%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server	13737466	13732896	-4570 (-0.03%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client	30676866	30666675	-10191 (-0.03%)	0.20%
handshake_tickets_ring_1.3_rsa_chacha_server	43723650	43709811	-13839 (-0.03%)	0.21%
handshake_no_resume_ring_1.3_ecdsap384_aes_server	13734534	13730216	-4318 (-0.03%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_client	41924438	41911955	-12483 (-0.03%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server	12654579	12658344	3765 (0.03%)	0.88%
handshake_tickets_ring_1.3_rsa_aes_server	43778025	43790432	12407 (0.03%)	0.21%
handshake_tickets_ring_1.3_ecdsap256_aes_client	42181844	42170243	-11601 (-0.03%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server	32473278	32464380	-8898 (-0.03%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server	43544015	43555878	11863 (0.03%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_server	43537986	43549240	11254 (0.03%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client	30451050	30458717	7667 (0.03%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server	32654327	32646301	-8026 (-0.02%)	0.20%
handshake_session_id_ring_1.2_rsa_aes_server	4324838	4323824	-1014 (-0.02%)	0.39%
transfer_no_resume_ring_1.3_ecdsap256_aes_server	46300467	46291420	-9047 (-0.02%)	0.22%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server	46265008	46256356	-8652 (-0.02%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server	4257825	4257044	-781 (-0.02%)	0.20%
transfer_no_resume_ring_1.2_rsa_aes_server	46167613	46175631	8018 (0.02%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client	30436599	30431580	-5019 (-0.02%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server	32698481	32693372	-5109 (-0.02%)	0.40%
handshake_session_id_ring_1.3_ecdsap256_aes_client	41999375	41993618	-5757 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server	32462641	32466984	4343 (0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client	35452613	35447892	-4721 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server	32438733	32434418	-4315 (-0.01%)	0.24%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client	3151883	3151465	-418 (-0.01%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server	80346783	80357416	10633 (0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client	35455108	35450564	-4544 (-0.01%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server	80454749	80444914	-9835 (-0.01%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client	57960339	57966995	6656 (0.01%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client	57977539	57971019	-6520 (-0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client	3897292	3896905	-387 (-0.01%)	0.34%
handshake_tickets_ring_1.3_rsa_chacha_client	42325487	42321434	-4053 (-0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_server	2126690	2126493	-197 (-0.01%)	0.39%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server	4262670	4262289	-381 (-0.01%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client	3340013	3340299	286 (0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client	30304788	30307289	2501 (0.01%)	0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client	4547368	4547006	-362 (-0.01%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client	92450632	92457945	7313 (0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client	4184062	4184381	319 (0.01%)	0.71%
handshake_session_id_ring_1.3_rsa_aes_server	43537946	43534634	-3312 (-0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client	42011242	42008140	-3102 (-0.01%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client	3366220	3365983	-237 (-0.01%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client	58064634	58060604	-4030 (-0.01%)	0.20%
handshake_no_resume_ring_1.3_rsa_aes_client	4538071	4537810	-261 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server	32463775	32461946	-1829 (-0.01%)	0.25%
handshake_tickets_ring_1.3_ecdsap384_chacha_server	43676994	43679302	2308 (0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client	30247691	30246193	-1498 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_server	43680701	43682854	2153 (0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server	12246695	12246099	-596 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client	42170954	42172740	1786 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server	43752984	43754774	1790 (0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server	43449440	43451163	1723 (0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client	41931380	41933012	1632 (0.00%)	0.20%
handshake_no_resume_ring_1.2_rsa_aes_server	12042564	12043011	447 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client	3355574	3355457	-117 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client	42104419	42105749	1330 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client	92434457	92437070	2613 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server	32666555	32665789	-766 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_aes_server	12237351	12237066	-285 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server	32628162	32628913	751 (0.00%)	0.25%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client	92398882	92396848	-2034 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server	46264844	46265734	890 (0.00%)	0.20%
handshake_no_resume_ring_1.2_rsa_aes_client	4440453	4440387	-66 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client	68385763	68386488	725 (0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client	58063964	58064448	484 (0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client	30268186	30268404	218 (0.00%)	0.48%
transfer_no_resume_ring_1.2_rsa_aes_client	57920398	57920015	-383 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_aes_client	58064195	58064516	321 (0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server	80343306	80343747	441 (0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server	46302145	46302399	254 (0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client	92398154	92398530	376 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client	42109129	42109286	157 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server	80455688	80455900	212 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client	57986174	57986103	-71 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client	92455949	92455875	-74 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server	80355562	80355514	-48 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client	92397077	92397118	41 (0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_aes_server	46290475	46290486	11 (0.00%)	0.20%

Wall-time

Significant differences

There are no significant wall-time differences

Other differences

Click to expand

Scenario	Baseline	Candidate	Diff	Threshold
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes	471.88 µs	473.41 µs	1.54 µs (0.33%)	2.64%
handshake_tickets_ring_1.3_ecdsap256_chacha	6.86 ms	6.84 ms	-0.02 ms (-0.25%)	1.42%
transfer_no_resume_ring_1.3_ecdsap256_aes	6.59 ms	6.57 ms	-0.02 ms (-0.24%)	3.46%
handshake_no_resume_ring_1.2_rsa_aes	1.07 ms	1.07 ms	0.00 ms (0.23%)	1.02%
handshake_tickets_ring_1.3_rsa_aes	7.53 ms	7.51 ms	-0.02 ms (-0.23%)	1.07%
handshake_tickets_ring_1.3_ecdsap256_aes	6.89 ms	6.88 ms	-0.02 ms (-0.22%)	1.53%
handshake_session_id_ring_1.3_rsa_chacha	7.48 ms	7.46 ms	-0.02 ms (-0.22%)	1.22%
handshake_tickets_ring_1.3_rsa_chacha	7.49 ms	7.47 ms	-0.02 ms (-0.21%)	1.06%
transfer_no_resume_ring_1.3_ecdsap384_aes	9.70 ms	9.68 ms	-0.02 ms (-0.21%)	2.58%
handshake_session_id_aws_lc_rs_1.2_rsa_aes	2.16 ms	2.16 ms	0.00 ms (0.20%)	1.75%
handshake_session_id_ring_1.3_ecdsap256_chacha	6.85 ms	6.83 ms	-0.01 ms (-0.19%)	1.19%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes	5.36 ms	5.34 ms	-0.01 ms (-0.19%)	1.83%
handshake_no_resume_ring_1.3_ecdsap256_aes	503.03 µs	503.92 µs	0.89 µs (0.18%)	2.13%
handshake_session_id_ring_1.3_rsa_aes	7.52 ms	7.51 ms	-0.01 ms (-0.17%)	1.10%
transfer_no_resume_ring_1.3_rsa_aes	7.17 ms	7.15 ms	-0.01 ms (-0.17%)	2.47%
handshake_session_id_ring_1.3_ecdsap256_aes	6.89 ms	6.87 ms	-0.01 ms (-0.16%)	1.47%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha	471.02 µs	471.76 µs	0.74 µs (0.16%)	2.52%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes	1.36 ms	1.36 ms	0.00 ms (0.15%)	1.01%
transfer_no_resume_ring_1.2_rsa_aes	7.07 ms	7.05 ms	-0.01 ms (-0.15%)	2.74%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes	6.07 ms	6.06 ms	-0.01 ms (-0.13%)	1.52%
handshake_no_resume_ring_1.3_rsa_aes	1.08 ms	1.08 ms	-0.00 ms (-0.13%)	1.00%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes	5.46 ms	5.46 ms	-0.01 ms (-0.13%)	3.83%
handshake_tickets_aws_lc_rs_1.2_rsa_aes	2.32 ms	2.32 ms	0.00 ms (0.13%)	1.73%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes	6.09 ms	6.08 ms	-0.01 ms (-0.12%)	1.56%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha	13.24 ms	13.23 ms	-0.01 ms (-0.11%)	1.40%
transfer_no_resume_ring_1.3_rsa_chacha	13.83 ms	13.82 ms	-0.01 ms (-0.10%)	1.50%
handshake_tickets_ring_1.2_rsa_aes	1.83 ms	1.83 ms	0.00 ms (0.10%)	1.71%
handshake_no_resume_ring_1.3_ecdsap256_chacha	502.30 µs	502.78 µs	0.47 µs (0.09%)	2.34%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha	1.18 ms	1.18 ms	0.00 ms (0.09%)	1.10%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes	5.37 ms	5.36 ms	-0.00 ms (-0.09%)	1.93%
handshake_session_id_ring_1.3_ecdsap384_chacha	9.95 ms	9.94 ms	-0.01 ms (-0.08%)	1.33%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes	5.68 ms	5.68 ms	-0.00 ms (-0.07%)	3.48%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes	4.74 ms	4.74 ms	-0.00 ms (-0.07%)	4.25%
handshake_no_resume_ring_1.3_ecdsap384_aes	3.61 ms	3.61 ms	0.00 ms (0.07%)	1.15%
handshake_tickets_ring_1.3_ecdsap384_aes	10.00 ms	9.99 ms	-0.01 ms (-0.06%)	1.00%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha	1.40 ms	1.40 ms	0.00 ms (0.06%)	1.00%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha	13.94 ms	13.93 ms	-0.01 ms (-0.06%)	1.56%
handshake_no_resume_ring_1.3_ecdsap384_chacha	3.61 ms	3.61 ms	0.00 ms (0.06%)	1.18%
handshake_session_id_ring_1.3_ecdsap384_aes	9.98 ms	9.98 ms	-0.01 ms (-0.05%)	1.00%
transfer_no_resume_ring_1.3_ecdsap256_chacha	13.24 ms	13.24 ms	-0.01 ms (-0.05%)	1.64%
handshake_tickets_ring_1.3_ecdsap384_chacha	9.96 ms	9.95 ms	-0.00 ms (-0.05%)	1.17%
handshake_tickets_aws_lc_rs_1.3_rsa_aes	6.36 ms	6.36 ms	-0.00 ms (-0.04%)	1.38%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha	6.37 ms	6.37 ms	-0.00 ms (-0.04%)	1.82%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha	6.05 ms	6.05 ms	-0.00 ms (-0.04%)	1.59%
handshake_session_id_aws_lc_rs_1.3_rsa_aes	6.35 ms	6.35 ms	-0.00 ms (-0.03%)	1.56%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes	5.69 ms	5.69 ms	0.00 ms (0.03%)	3.52%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha	14.18 ms	14.17 ms	-0.00 ms (-0.03%)	1.30%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha	6.08 ms	6.08 ms	-0.00 ms (-0.03%)	1.76%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha	6.35 ms	6.34 ms	-0.00 ms (-0.03%)	1.44%
handshake_session_id_ring_1.2_rsa_aes	1.75 ms	1.75 ms	-0.00 ms (-0.03%)	2.46%
handshake_no_resume_ring_1.3_rsa_chacha	1.08 ms	1.08 ms	0.00 ms (0.03%)	1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha	5.38 ms	5.37 ms	-0.00 ms (-0.02%)	1.90%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes	1.41 ms	1.41 ms	0.00 ms (0.01%)	1.00%
transfer_no_resume_ring_1.3_ecdsap384_chacha	16.35 ms	16.35 ms	-0.00 ms (-0.01%)	1.48%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha	5.35 ms	5.35 ms	-0.00 ms (-0.01%)	1.90%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes	1.18 ms	1.18 ms	-0.00 ms (-0.00%)	1.04%

Additional information

Historical results

Checkout details:

• Base repo: https://github.com/rustls/rustls.git
• Base branch: main (e1eb447)
• Candidate repo: https://github.com/rustls/rustls.git
• Candidate branch: jbp-quicker-merge-queue (2dc4277)

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.82%. Comparing base (e1eb447) to head (2dc4277).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1840   +/-   ##
=======================================
  Coverage   95.82%   95.82%           
=======================================
  Files          84       84           
  Lines       18866    18866           
=======================================
  Hits        18078    18078           
  Misses        788      788           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[djc]

Interesting! Maybe there's something cleaner to achieve with this?

https://stackoverflow.com/questions/65384420/how-do-i-make-a-github-action-matrix-element-conditional

[ctz]

Thanks! The conditional exclude idea there seemed like the clearest way, though because include happens after exclude I had to remove the include parts. But I think it is clearer (if it works, which is annoying to test because merge queue is only available in org repos).

[ctz]

This worked -- https://github.com/rustls/rustls/actions/runs/8189236658 -- though fairly predictably I had to remove those platform's jobs from the branch protection rules.