diff options
| author | Noah Goldstein <goldstein.w.n@gmail.com> | 2023-07-17 23:14:33 -0500 |
|---|---|---|
| committer | Noah Goldstein <goldstein.w.n@gmail.com> | 2023-09-05 17:17:01 -0500 |
| commit | 42c266a18f1aa87813b138247f98d7b690c67f34 (patch) | |
| tree | 92d6e352f3bf6e377af5ac61b01e1f46a8903588 | |
| parent | 2e74c9016724ce09512920b79485a87d75a00f59 (diff) | |
| download | glibc-42c266a18f1aa87813b138247f98d7b690c67f34.tar glibc-42c266a18f1aa87813b138247f98d7b690c67f34.tar.gz glibc-42c266a18f1aa87813b138247f98d7b690c67f34.tar.bz2 glibc-42c266a18f1aa87813b138247f98d7b690c67f34.zip | |
x86: Fix slight bug in `shared_per_thread` cache size calculation.
After:
```
commit af992e7abdc9049714da76cae1e5e18bc4838fb8
Author: Noah Goldstein <goldstein.w.n@gmail.com>
Date: Wed Jun 7 13:18:01 2023 -0500
x86: Increase `non_temporal_threshold` to roughly `sizeof_L3 / 4`
```
Split `shared` (cumulative cache size) from `shared_per_thread` (cache
size per socket), the `shared_per_thread` *can* be slightly off from
the previous calculation.
Previously we added `core` even if `threads_l2` was invalid, and only
used `threads_l2` to divide `core` if it was present. The changed
version only included `core` if `threads_l2` was valid.
This change restores the old behavior if `threads_l2` is invalid by
adding the entire value of `core`.
Reviewed-by: DJ Delorie <dj@redhat.com>
(cherry picked from commit 47f747217811db35854ea06741be3685e8bbd44d)
| -rw-r--r-- | sysdeps/x86/dl-cacheinfo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h index 6e7d0197a7..79fb8cc5e3 100644 --- a/sysdeps/x86/dl-cacheinfo.h +++ b/sysdeps/x86/dl-cacheinfo.h @@ -685,8 +685,8 @@ get_common_cache_info (long int *shared_ptr, long int * shared_per_thread_ptr, u /* Account for non-inclusive L2 and L3 caches. */ if (!inclusive_cache) { - if (threads_l2 > 0) - shared_per_thread += core / threads_l2; + long int core_per_thread = threads_l2 > 0 ? (core / threads_l2) : core; + shared_per_thread += core_per_thread; shared += core; } |