bogo: fix config rewriting when cpp is clang

[djc]

The previous setup failed for me on macOS, where cpp is "Apple clang version 15.0.0 (clang-1500.3.9.4)". I think this approach works with both gcc ("cpp (Gentoo 13.2.1_p20240210 p14) 13.2.1 20240210") and clang.

[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_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client	8745366	8687048	-58318 (-0.67%)	0.84%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_server	3927605	3949522	21917 (0.56%)	6.92%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server	4399433	4415915	16482 (0.37%)	2.97%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client	8712153	8737773	25620 (0.29%)	1.21%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server	13758373	13789819	31446 (0.23%)	0.81%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client	30360821	30411739	50918 (0.17%)	0.50%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server	46526969	46449935	-77034 (-0.17%)	0.32%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client	30171648	30133043	-38605 (-0.13%)	0.32%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client	30168764	30206278	37514 (0.12%)	0.31%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client	58216053	58285363	69310 (0.12%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server	32379363	32405375	26012 (0.08%)	0.56%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client	92715903	92655670	-60233 (-0.06%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_client	3914172	3912211	-1961 (-0.05%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client	30359691	30345226	-14465 (-0.05%)	0.35%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server	80645482	80610461	-35021 (-0.04%)	0.26%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server	32703684	32690683	-13001 (-0.04%)	0.55%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server	46370755	46387698	16943 (0.04%)	0.37%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server	13427478	13432322	4844 (0.04%)	1.24%
handshake_session_id_ring_1.2_rsa_aes_client	4233769	4232795	-974 (-0.02%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server	13781417	13784548	3131 (0.02%)	1.16%
handshake_tickets_ring_1.2_rsa_aes_server	4664113	4663314	-799 (-0.02%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client	3366203	3365664	-539 (-0.02%)	0.24%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client	3916018	3915438	-580 (-0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server	2131364	2131105	-259 (-0.01%)	0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_server	2129628	2129415	-213 (-0.01%)	0.20%
handshake_session_id_ring_1.2_rsa_aes_server	4232507	4232109	-398 (-0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_client	41767398	41763559	-3839 (-0.01%)	0.20%
handshake_tickets_ring_1.2_rsa_aes_client	4507814	4508208	394 (0.01%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_client	41848402	41851631	3229 (0.01%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client	30379863	30382000	2137 (0.01%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client	58229775	58233303	3528 (0.01%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_client	42037094	42039538	2444 (0.01%)	0.20%
handshake_no_resume_ring_1.3_rsa_aes_client	2949111	2948947	-164 (-0.01%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client	30170351	30171871	1520 (0.01%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client	92689469	92685114	-4355 (-0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client	2014667	2014580	-87 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_server	13737869	13737295	-574 (-0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server	4273516	4273339	-177 (-0.00%)	0.20%
handshake_no_resume_ring_1.2_rsa_aes_client	2855761	2855878	117 (0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client	30158482	30157337	-1145 (-0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client	30182301	30183445	1144 (0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server	12173805	12174259	454 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client	41962615	41964033	1418 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client	41966554	41965157	-1397 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client	58318472	58320316	1844 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client	42032096	42030822	-1274 (-0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client	41843485	41844625	1140 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server	32700605	32701424	819 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server	4276654	4276553	-101 (-0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client	2215967	2215917	-50 (-0.00%)	0.20%
handshake_tickets_ring_1.3_rsa_chacha_server	43615785	43614838	-947 (-0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server	32459771	32460467	696 (0.00%)	0.78%
handshake_tickets_ring_1.3_rsa_aes_client	42049726	42050624	898 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client	30373083	30372459	-624 (-0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server	32439000	32439654	654 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server	1892206	1892170	-36 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server	32677525	32678094	569 (0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client	2954779	2954728	-51 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client	92650903	92649415	-1488 (-0.00%)	0.20%
handshake_no_resume_ring_1.2_rsa_aes_server	11984943	11985133	190 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client	2222983	2223017	34 (0.00%)	0.20%
handshake_no_resume_ring_1.3_rsa_aes_server	12167687	12167868	181 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server	1895534	1895562	28 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client	30357944	30357514	-430 (-0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client	41762542	41763130	588 (0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server	13739501	13739679	178 (0.00%)	0.20%
handshake_tickets_ring_1.3_rsa_chacha_client	41980740	41980241	-499 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client	58315042	58315721	679 (0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server	43310236	43310683	447 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server	32678452	32678116	-336 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server	32722891	32722566	-325 (-0.00%)	0.82%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server	32399140	32399454	314 (0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server	32398978	32399285	307 (0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client	35471780	35471446	-334 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server	80515100	80514348	-752 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_server	43617580	43617214	-366 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server	46457013	46457394	381 (0.00%)	0.20%
handshake_session_id_ring_1.3_rsa_chacha_server	43308146	43307847	-299 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client	4298607	4298636	29 (0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_server	46453302	46453600	298 (0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server	43411369	43411645	276 (0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_aes_server	46461996	46461717	-279 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client	92692282	92691733	-549 (-0.00%)	0.20%
handshake_tickets_ring_1.3_rsa_aes_server	43690382	43690125	-257 (-0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_server	43411233	43411485	252 (0.00%)	0.20%
handshake_session_id_ring_1.3_rsa_aes_server	43409388	43409143	-245 (-0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client	3972821	3972802	-19 (-0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server	32439084	32439239	155 (0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server	32701545	32701389	-156 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_server	43618064	43618271	207 (0.00%)	0.20%
handshake_session_id_ring_1.3_rsa_aes_client	41861726	41861910	184 (0.00%)	0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_server	43310768	43310600	-168 (-0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server	43692165	43691996	-169 (-0.00%)	0.20%
handshake_session_id_ring_1.3_rsa_chacha_client	41781376	41781216	-160 (-0.00%)	0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client	35473485	35473352	-133 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client	92647595	92647926	331 (0.00%)	0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client	3369300	3369312	12 (0.00%)	0.23%
transfer_no_resume_ring_1.3_rsa_chacha_client	92652378	92652049	-329 (-0.00%)	0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client	30395436	30395530	94 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server	80609355	80609529	174 (0.00%)	0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_server	43691950	43691889	-61 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server	46430177	46430240	63 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server	80609577	80609477	-100 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server	80506812	80506909	97 (0.00%)	0.20%
transfer_no_resume_ring_1.2_rsa_aes_client	58202845	58202786	-59 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server	80510447	80510511	64 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client	68656141	68656098	-43 (-0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server	46430251	46430280	29 (0.00%)	0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client	30196154	30196172	18 (0.00%)	0.20%
transfer_no_resume_ring_1.2_rsa_aes_server	46361740	46361724	-16 (-0.00%)	0.20%
transfer_no_resume_ring_1.3_rsa_aes_client	58319034	58319044	10 (0.00%)	0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client	58234227	58234226	-1 (-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
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes	4.50 ms	4.54 ms	0.04 ms (0.82%)	5.39%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes	5.44 ms	5.48 ms	0.04 ms (0.73%)	4.42%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha	475.89 µs	479.35 µs	3.45 µs (0.73%)	3.51%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes	5.44 ms	5.47 ms	0.03 ms (0.62%)	4.12%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes	476.76 µs	479.70 µs	2.94 µs (0.62%)	3.96%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes	5.22 ms	5.25 ms	0.03 ms (0.58%)	4.39%
transfer_no_resume_ring_1.3_ecdsap256_aes	6.32 ms	6.36 ms	0.04 ms (0.56%)	3.62%
transfer_no_resume_ring_1.2_rsa_aes	6.73 ms	6.76 ms	0.03 ms (0.48%)	3.52%
transfer_no_resume_ring_1.3_rsa_aes	6.82 ms	6.85 ms	0.03 ms (0.45%)	3.19%
handshake_no_resume_ring_1.3_ecdsap256_aes	504.31 µs	506.45 µs	2.15 µs (0.43%)	2.50%
transfer_no_resume_ring_1.3_ecdsap384_aes	9.42 ms	9.46 ms	0.04 ms (0.40%)	2.41%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes	1.36 ms	1.36 ms	0.01 ms (0.38%)	1.33%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha	1.40 ms	1.41 ms	0.00 ms (0.34%)	1.17%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha	1.18 ms	1.19 ms	0.00 ms (0.31%)	1.20%
transfer_no_resume_ring_1.3_rsa_chacha	13.47 ms	13.50 ms	0.04 ms (0.28%)	1.96%
handshake_no_resume_ring_1.3_ecdsap256_chacha	502.25 µs	503.63 µs	1.39 µs (0.28%)	2.42%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha	13.91 ms	13.94 ms	0.04 ms (0.28%)	1.72%
transfer_no_resume_ring_1.3_ecdsap256_chacha	12.97 ms	13.01 ms	0.04 ms (0.27%)	1.78%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha	12.96 ms	13.00 ms	0.03 ms (0.26%)	1.81%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha	13.68 ms	13.71 ms	0.03 ms (0.25%)	1.73%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes	1.41 ms	1.41 ms	0.00 ms (0.24%)	1.09%
transfer_no_resume_ring_1.3_ecdsap384_chacha	16.07 ms	16.11 ms	0.03 ms (0.21%)	1.38%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha	5.98 ms	5.97 ms	-0.01 ms (-0.18%)	1.00%
handshake_no_resume_ring_1.3_rsa_chacha	997.55 µs	999.06 µs	1.50 µs (0.15%)	1.17%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes	5.97 ms	5.97 ms	-0.01 ms (-0.15%)	1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha	5.26 ms	5.26 ms	-0.01 ms (-0.15%)	1.00%
handshake_session_id_ring_1.2_rsa_aes	1.55 ms	1.55 ms	0.00 ms (0.14%)	1.35%
handshake_tickets_aws_lc_rs_1.3_rsa_aes	6.21 ms	6.20 ms	-0.01 ms (-0.13%)	1.00%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha	6.22 ms	6.21 ms	-0.01 ms (-0.12%)	1.00%
handshake_tickets_ring_1.3_rsa_aes	7.22 ms	7.21 ms	-0.01 ms (-0.10%)	1.00%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes	5.26 ms	5.25 ms	-0.01 ms (-0.10%)	1.08%
handshake_no_resume_ring_1.3_rsa_aes	996.22 µs	997.16 µs	0.94 µs (0.09%)	1.36%
handshake_tickets_aws_lc_rs_1.2_rsa_aes	2.21 ms	2.21 ms	0.00 ms (0.09%)	1.57%
handshake_session_id_ring_1.3_ecdsap256_chacha	6.66 ms	6.65 ms	-0.01 ms (-0.09%)	1.00%
handshake_session_id_ring_1.3_rsa_aes	7.19 ms	7.18 ms	-0.01 ms (-0.08%)	1.00%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha	6.18 ms	6.17 ms	-0.01 ms (-0.08%)	1.00%
handshake_no_resume_ring_1.2_rsa_aes	976.26 µs	977.03 µs	0.77 µs (0.08%)	1.00%
handshake_session_id_ring_1.3_ecdsap256_aes	6.69 ms	6.69 ms	-0.01 ms (-0.08%)	1.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes	5.24 ms	5.24 ms	-0.00 ms (-0.08%)	1.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha	5.24 ms	5.24 ms	-0.00 ms (-0.08%)	1.00%
handshake_no_resume_ring_1.3_ecdsap384_chacha	3.60 ms	3.60 ms	0.00 ms (0.08%)	1.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha	5.94 ms	5.94 ms	-0.00 ms (-0.07%)	1.00%
handshake_session_id_ring_1.3_ecdsap384_chacha	9.75 ms	9.74 ms	-0.01 ms (-0.06%)	1.00%
handshake_tickets_ring_1.3_ecdsap384_aes	9.81 ms	9.81 ms	-0.01 ms (-0.05%)	1.00%
handshake_session_id_aws_lc_rs_1.3_rsa_aes	6.20 ms	6.19 ms	-0.00 ms (-0.05%)	1.00%
handshake_tickets_ring_1.3_ecdsap384_chacha	9.77 ms	9.76 ms	-0.00 ms (-0.05%)	1.00%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes	5.96 ms	5.96 ms	-0.00 ms (-0.04%)	1.00%
handshake_session_id_ring_1.3_rsa_chacha	7.14 ms	7.14 ms	-0.00 ms (-0.04%)	1.00%
handshake_tickets_ring_1.3_rsa_chacha	7.17 ms	7.16 ms	-0.00 ms (-0.03%)	1.00%
handshake_session_id_aws_lc_rs_1.2_rsa_aes	2.05 ms	2.05 ms	0.00 ms (0.03%)	1.81%
handshake_tickets_ring_1.3_ecdsap256_aes	6.72 ms	6.72 ms	-0.00 ms (-0.03%)	1.09%
handshake_tickets_ring_1.2_rsa_aes	1.63 ms	1.63 ms	-0.00 ms (-0.03%)	1.15%
handshake_session_id_ring_1.3_ecdsap384_aes	9.78 ms	9.78 ms	-0.00 ms (-0.02%)	1.00%
handshake_no_resume_ring_1.3_ecdsap384_aes	3.60 ms	3.60 ms	0.00 ms (0.01%)	1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes	1.19 ms	1.19 ms	-0.00 ms (-0.01%)	1.44%
handshake_tickets_ring_1.3_ecdsap256_chacha	6.67 ms	6.67 ms	-0.00 ms (-0.01%)	1.37%

Additional information

Historical results

Checkout details:

• Base repo: https://github.com/rustls/rustls.git
• Base branch: main (6faac22)
• Candidate repo: https://github.com/rustls/rustls.git
• Candidate branch: cpp-stdout (103ec98)

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.48%. Comparing base (6faac22) to head (103ec98).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #1948   +/-   ##
=======================================
  Coverage   95.48%   95.48%           
=======================================
  Files          86       86           
  Lines       18654    18654           
=======================================
  Hits        17811    17811           
  Misses        843      843           

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

[ctz]

fwiw clang-cpp-15 worked in both ways for me

[djc]

fwiw clang-cpp-15 worked in both ways for me

Weird. On my Mac the command writes to a file called -oconfig.json.