user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #471 from Demindiro/x86_64-fix-recursive-memcmp

Browse source
This commit is contained in:
Amanieu d'Antras 2022-06-12 02:19:30 +02:00 • committed by GitHub
commit d14c5a43b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
library/compiler-builtins/src/mem/x86_64.rs
View file

@ -143,5 +143,16 @@ pub unsafe fn compare_bytes(a: *const u8, b: *const u8, n: usize) -> i32 {
let c8 = |a: *const u64, b, n| cmp(a, b, n, c4);
let c16 = |a: *const u128, b, n| cmp(a, b, n, c8);
let c32 = |a: *const [u128; 2], b, n| cmp(a, b, n, c16);
c32(a.cast(), b.cast(), n)
// [u128; 2] internally uses raw_eq for comparisons, which may emit a call to memcmp
// above a certain size threshold. When SSE2 is enabled this threshold does not seem
// to be reached but without SSE2 a call is emitted, leading to infinite recursion.
//
// While replacing [u128; 2] with (u128, u128) fixes the issues it degrades performance
// severely. Likewise, removing c32() has a lesser but still significant impact. Instead the
// [u128; 2] case is only enabled when SSE2 is present.
if cfg!(target_feature = "sse2") {
c32(a.cast(), b.cast(), n)
} else {
c16(a.cast(), b.cast(), n)
}
}