Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix rustc-check-cfg #1975

Merged
merged 1 commit into from
May 30, 2024
Merged

fix rustc-check-cfg #1975

merged 1 commit into from
May 30, 2024

Conversation

cpu
Copy link
Member

@cpu cpu commented May 30, 2024

Previously (#1942) we updated build.rs to emit the rustc-check-cfg directive required to indicate bench and read_buf are expected cfg conditions.

Unfortunately I only did that in one of the two main impls, meaning in some build configurations the clippy warnings persisted.

This commit updates both mains to do the correct thing.

Previously we updated `build.rs` to emit the `rustc-check-cfg` directive
required to indicate `bench` and `read_buf` are expected cfg conditions.

Unfortunately I only did that in one of the two `main` impls, meaning in
some build configurations the clippy warnings persisted.

This commit updates both `main`s to do the correct thing.
@cpu cpu added this pull request to the merge queue May 30, 2024
Copy link

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 3923894 3973931 50037 (1.28%) 7.70%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_server 4379082 4394277 15195 (0.35%) 2.94%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_server 13819110 13776148 -42962 (-0.31%) 0.76%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_server 46430713 46333144 -97569 (-0.21%) 0.44%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_server 13788593 13817399 28806 (0.21%) 0.86%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_server 33152693 33087935 -64758 (-0.20%) 0.71%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_server 32792792 32855110 62318 (0.19%) 0.56%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_server 32894741 32832684 -62057 (-0.19%) 0.56%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_server 13397468 13386913 -10555 (-0.08%) 1.50%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 8738982 8744645 5663 (0.06%) 1.15%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_server 33116107 33095119 -20988 (-0.06%) 0.46%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_server 80552962 80597993 45031 (0.06%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_client 3913723 3915880 2157 (0.06%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_client 30775676 30760291 -15385 (-0.05%) 0.33%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_client 30541058 30526241 -14817 (-0.05%) 0.41%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_client 30610190 30623897 13707 (0.04%) 0.43%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 8703811 8706942 3131 (0.04%) 0.92%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 3379823 3378704 -1119 (-0.03%) 0.31%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_client 58244352 58229535 -14817 (-0.03%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_client 92672410 92651417 -20993 (-0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 3383116 3382457 -659 (-0.02%) 0.22%
handshake_session_id_ring_1.3_ecdsap256_aes_client 41848117 41855976 7859 (0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 4290846 4290143 -703 (-0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 4286457 4287116 659 (0.02%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 1909933 1910206 273 (0.01%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_server 4664744 4664085 -659 (-0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.2_rsa_aes_client 4298045 4298631 586 (0.01%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_client 30824351 30820295 -4056 (-0.01%) 0.52%
handshake_no_resume_ring_1.3_ecdsap256_aes_client 3914496 3915001 505 (0.01%) 0.24%
handshake_tickets_ring_1.3_ecdsap256_chacha_server 43617490 43622863 5104 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_aes_server 43413519 43418055 4536 (0.01%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_client 2949110 2949416 306 (0.01%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_server 43312075 43316453 4378 (0.01%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_aes_server 2129411 2129615 204 (0.01%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 1913234 1913390 156 (0.01%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_client 2856036 2856265 229 (0.01%) 0.20%
handshake_session_id_aws_lc_rs_1.2_rsa_aes_client 3971790 3971529 -261 (-0.01%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_client 2955087 2955263 176 (0.01%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_server 46400159 46402916 2757 (0.01%) 0.35%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes_client 2014905 2014805 -100 (-0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha_client 2232034 2232138 104 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_client 30579869 30581198 1329 (0.00%) 0.20%
handshake_tickets_ring_1.2_rsa_aes_client 4506788 4506601 -187 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_server 32904647 32903337 -1310 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_chacha_client 41974027 41975654 1627 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha_server 33137518 33138601 1083 (0.00%) 0.20%
handshake_no_resume_ring_1.2_rsa_aes_server 11985540 11985152 -388 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes_client 30608507 30607556 -951 (-0.00%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_client 4232680 4232804 124 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_client 30783924 30784768 844 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha_client 30595301 30863476 -825 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_client 41847971 41846850 -1121 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha_server 32863161 32862305 -856 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_client 42041096 42040006 -1090 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_client 42036894 42035882 -1012 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap256_chacha_client 41773425 41774350 925 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_server 13739713 13740002 289 (0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_rsa_aes_client 30620796 30621433 637 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_client 58230009 58231205 1196 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes_server 33163287 33162633 -654 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes_server 46430607 46429771 -836 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_client 92652746 92651097 -1649 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_client 58316044 58317064 1020 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_client 30806909 30806381 -528 (-0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_client 41865988 41865376 -612 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha_server 32861870 32862322 452 (0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_aes_server 43410424 43410986 562 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha_server 80608432 80609384 952 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_aes_server 12168157 12168017 -140 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_client 41766735 41766273 -462 (-0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha_server 33138704 33138339 -365 (-0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_server 46361171 46361644 473 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_client 58315273 58314713 -560 (-0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_aes_client 30824165 30824457 292 (0.00%) 0.20%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes_client 2225081 2225060 -21 (-0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_server 43309035 43309423 388 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_client 35471537 35471825 288 (0.00%) 0.20%
handshake_session_id_ring_1.3_rsa_chacha_client 41784876 41784597 -279 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_aes_server 46430134 46429839 -295 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap256_chacha_server 2131531 2131519 -12 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_server 43691295 43691062 -233 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_client 92651254 92651740 486 (0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_aes_server 13737546 13737618 72 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha_client 92691449 92691931 482 (0.00%) 0.20%
handshake_no_resume_ring_1.3_rsa_chacha_server 12174229 12174166 -63 (-0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_aes_server 43413054 43413274 220 (0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_server 43615699 43615917 218 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes_server 33163031 33163196 165 (0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_server 46461647 46461854 207 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap256_aes_server 43692947 43693127 180 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_server 43617596 43617770 174 (0.00%) 0.20%
handshake_session_id_ring_1.2_rsa_aes_server 4232443 4232427 -16 (-0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_aes_server 43693175 43693033 -142 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes_client 68653995 68654218 223 (0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_chacha_server 80514442 80514695 253 (0.00%) 0.20%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha_client 30801780 30801874 94 (0.00%) 0.20%
handshake_tickets_ring_1.3_ecdsap384_chacha_client 41966333 41966216 -117 (-0.00%) 0.20%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes_server 32903355 32903265 -90 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_client 92647084 92647315 231 (0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes_client 58233584 58233441 -143 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_aes_server 46457508 46457399 -109 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_chacha_client 41984188 41984279 91 (0.00%) 0.20%
handshake_session_id_ring_1.3_ecdsap384_chacha_server 43311874 43311783 -91 (-0.00%) 0.20%
transfer_no_resume_ring_1.2_rsa_aes_client 58200712 58200796 84 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap384_chacha_server 80510531 80510421 -110 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_aes_server 46453819 46453780 -39 (-0.00%) 0.20%
handshake_no_resume_ring_1.3_ecdsap384_chacha_client 35473730 35473704 -26 (-0.00%) 0.20%
handshake_tickets_ring_1.3_rsa_aes_client 42054172 42054144 -28 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_client 92689574 92689633 59 (0.00%) 0.20%
transfer_no_resume_ring_1.3_ecdsap256_chacha_server 80506915 80506874 -41 (-0.00%) 0.20%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha_server 80609228 80609197 -31 (-0.00%) 0.20%
transfer_no_resume_ring_1.3_rsa_aes_client 58318705 58318717 12 (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.52 ms 4.45 ms -0.07 ms (-1.56%) 6.44%
transfer_no_resume_aws_lc_rs_1.3_rsa_aes 5.46 ms 5.39 ms -0.07 ms (-1.25%) 4.88%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_aes 5.24 ms 5.18 ms -0.06 ms (-1.17%) 5.52%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 482.31 µs 476.82 µs -5.50 µs (-1.14%) 2.98%
handshake_no_resume_aws_lc_rs_1.3_ecdsap256_aes 482.98 µs 477.64 µs -5.34 µs (-1.11%) 2.60%
transfer_no_resume_aws_lc_rs_1.2_rsa_aes 5.45 ms 5.39 ms -0.06 ms (-1.07%) 4.29%
transfer_no_resume_ring_1.3_ecdsap256_aes 6.34 ms 6.28 ms -0.06 ms (-1.02%) 4.11%
transfer_no_resume_ring_1.3_rsa_aes 6.84 ms 6.77 ms -0.07 ms (-0.99%) 3.76%
transfer_no_resume_ring_1.2_rsa_aes 6.76 ms 6.69 ms -0.07 ms (-0.98%) 3.51%
handshake_no_resume_ring_1.3_ecdsap256_aes 506.59 µs 501.80 µs -4.79 µs (-0.95%) 2.47%
handshake_no_resume_ring_1.3_ecdsap256_chacha 504.02 µs 499.93 µs -4.09 µs (-0.81%) 2.75%
transfer_no_resume_ring_1.3_ecdsap384_aes 9.45 ms 9.38 ms -0.08 ms (-0.81%) 2.97%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_aes 5.43 ms 5.39 ms -0.04 ms (-0.75%) 1.44%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_chacha 5.40 ms 5.36 ms -0.04 ms (-0.70%) 1.40%
handshake_tickets_aws_lc_rs_1.3_ecdsap256_chacha 5.43 ms 5.39 ms -0.04 ms (-0.69%) 1.35%
handshake_session_id_aws_lc_rs_1.3_ecdsap256_aes 5.41 ms 5.37 ms -0.04 ms (-0.69%) 1.28%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_chacha 6.13 ms 6.10 ms -0.04 ms (-0.61%) 1.23%
handshake_tickets_aws_lc_rs_1.3_rsa_aes 6.37 ms 6.34 ms -0.04 ms (-0.60%) 1.14%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_chacha 6.10 ms 6.06 ms -0.03 ms (-0.57%) 1.37%
transfer_no_resume_ring_1.3_ecdsap256_chacha 12.99 ms 12.92 ms -0.07 ms (-0.56%) 2.08%
handshake_tickets_aws_lc_rs_1.3_ecdsap384_aes 6.15 ms 6.11 ms -0.03 ms (-0.56%) 1.00%
transfer_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 13.70 ms 13.63 ms -0.08 ms (-0.55%) 2.12%
handshake_no_resume_ring_1.3_rsa_aes 1.00 ms 1.00 ms -0.01 ms (-0.53%) 1.00%
transfer_no_resume_aws_lc_rs_1.3_ecdsap256_chacha 12.98 ms 12.91 ms -0.07 ms (-0.53%) 2.34%
handshake_tickets_aws_lc_rs_1.3_rsa_chacha 6.37 ms 6.34 ms -0.03 ms (-0.53%) 1.46%
transfer_no_resume_aws_lc_rs_1.3_rsa_chacha 13.92 ms 13.85 ms -0.07 ms (-0.52%) 1.74%
handshake_session_id_aws_lc_rs_1.3_rsa_chacha 6.34 ms 6.30 ms -0.03 ms (-0.52%) 1.30%
handshake_session_id_aws_lc_rs_1.3_ecdsap384_aes 6.12 ms 6.09 ms -0.03 ms (-0.49%) 1.08%
handshake_session_id_aws_lc_rs_1.3_rsa_aes 6.35 ms 6.32 ms -0.03 ms (-0.49%) 1.39%
transfer_no_resume_ring_1.3_ecdsap384_chacha 16.10 ms 16.02 ms -0.08 ms (-0.48%) 1.61%
transfer_no_resume_ring_1.3_rsa_chacha 13.48 ms 13.42 ms -0.06 ms (-0.47%) 1.84%
handshake_no_resume_ring_1.3_rsa_chacha 1.00 ms 1.00 ms -0.00 ms (-0.43%) 1.00%
handshake_tickets_aws_lc_rs_1.2_rsa_aes 2.23 ms 2.22 ms -0.01 ms (-0.40%) 2.49%
handshake_no_resume_aws_lc_rs_1.2_rsa_aes 1.36 ms 1.36 ms -0.01 ms (-0.38%) 3.17%
handshake_no_resume_ring_1.3_ecdsap384_chacha 3.61 ms 3.60 ms -0.01 ms (-0.36%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_rsa_aes 1.41 ms 1.41 ms -0.01 ms (-0.35%) 3.55%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_chacha 1.19 ms 1.18 ms -0.00 ms (-0.34%) 1.18%
handshake_no_resume_ring_1.2_rsa_aes 978.25 µs 975.17 µs -3.08 µs (-0.31%) 1.00%
handshake_no_resume_ring_1.3_ecdsap384_aes 3.61 ms 3.60 ms -0.01 ms (-0.30%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_ecdsap384_aes 1.20 ms 1.19 ms -0.00 ms (-0.29%) 1.00%
handshake_no_resume_aws_lc_rs_1.3_rsa_chacha 1.40 ms 1.40 ms -0.00 ms (-0.28%) 3.07%
handshake_session_id_aws_lc_rs_1.2_rsa_aes 2.06 ms 2.05 ms -0.01 ms (-0.27%) 3.74%
handshake_session_id_ring_1.2_rsa_aes 1.56 ms 1.55 ms -0.00 ms (-0.27%) 1.15%
handshake_tickets_ring_1.2_rsa_aes 1.63 ms 1.63 ms -0.00 ms (-0.27%) 1.56%
handshake_tickets_ring_1.3_ecdsap384_aes 9.84 ms 9.81 ms -0.02 ms (-0.25%) 1.00%
handshake_session_id_ring_1.3_ecdsap384_aes 9.80 ms 9.78 ms -0.02 ms (-0.22%) 1.00%
handshake_session_id_ring_1.3_rsa_aes 7.21 ms 7.20 ms -0.02 ms (-0.21%) 1.00%
handshake_tickets_ring_1.3_ecdsap384_chacha 9.80 ms 9.78 ms -0.02 ms (-0.20%) 1.00%
handshake_tickets_ring_1.3_rsa_aes 7.23 ms 7.22 ms -0.01 ms (-0.20%) 1.00%
handshake_session_id_ring_1.3_ecdsap384_chacha 9.77 ms 9.76 ms -0.02 ms (-0.16%) 1.00%
handshake_session_id_ring_1.3_rsa_chacha 7.17 ms 7.16 ms -0.01 ms (-0.13%) 1.00%
handshake_tickets_ring_1.3_rsa_chacha 7.19 ms 7.18 ms -0.01 ms (-0.11%) 1.05%
handshake_session_id_ring_1.3_ecdsap256_aes 6.70 ms 6.70 ms -0.01 ms (-0.10%) 1.00%
handshake_tickets_ring_1.3_ecdsap256_aes 6.73 ms 6.73 ms -0.01 ms (-0.08%) 1.05%
handshake_session_id_ring_1.3_ecdsap256_chacha 6.67 ms 6.67 ms -0.00 ms (-0.04%) 1.00%
handshake_tickets_ring_1.3_ecdsap256_chacha 6.69 ms 6.69 ms -0.00 ms (-0.02%) 1.01%

Additional information

Historical results

Checkout details:

Merged via the queue into rustls:main with commit 29bdc8c May 30, 2024
23 checks passed
@cpu cpu deleted the cpu-fix-check-cfg-again branch May 30, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants