diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-11-05 07:57:46 -0400 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-09 01:33:18 +0100 |
| commit | 827face44bf189f562225339d015a3b4b5cad023 (patch) | |
| tree | af8556e2a9bc6ff34d7d209c67c3ed8744e74091 | |
| parent | ca47880178b8611e37786770c252827d5faba260 (diff) | |
| download | glibc-827face44bf189f562225339d015a3b4b5cad023.tar.gz glibc-827face44bf189f562225339d015a3b4b5cad023.tar.xz glibc-827face44bf189f562225339d015a3b4b5cad023.zip | |
32bit memset-sse2.S fails with uneven cache size
32bit memset-sse2.S assumes cache size is multiple of 128 bytes. If it isn't true, memset-sse2.S will fail. For example, a processor can have 24576 KB L3 cache and 20 cores. That is 2516582 byte per core. Half of it is 1258291, which isn't helpful for vector instructions. This patch rounds cache sizes to multiple of 256 bytes. (cherry picked from commit c0dde15b5dba7e02ce6f36eab3a4d1c166f9951b but removed introduction of new variables)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/x86_64/cacheinfo.c | 12 |
2 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 0daa4e349b..cadc5dcc30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-11-03 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #12191] + * sysdeps/x86_64/cacheinfo.c (init_cacheinfo): Round + __x86_64_data_cache_size_half, __x86_64_data_cache_size + __x86_64_shared_cache_size_half and __x86_64_shared_cache_size, + to multiple of 256 bytes. + 2010-11-03 Ulrich Drepper <drepper@gmail.com> [BZ #12167] diff --git a/sysdeps/x86_64/cacheinfo.c b/sysdeps/x86_64/cacheinfo.c index 5b66c62eb3..31da2b888a 100644 --- a/sysdeps/x86_64/cacheinfo.c +++ b/sysdeps/x86_64/cacheinfo.c @@ -453,10 +453,10 @@ __cache_sysconf (int name) /* Half the data cache size for use in memory and string routines, typically - L1 size. */ + L1 size, rounded to multiple of 256 bytes. */ long int __x86_64_data_cache_size_half attribute_hidden = 32 * 1024 / 2; /* Shared cache size for use in memory and string routines, typically - L2 or L3 size. */ + L2 or L3 size, rounded to multiple of 256 bytes. */ long int __x86_64_shared_cache_size_half attribute_hidden = 1024 * 1024 / 2; long int __x86_64_shared_cache_size attribute_hidden = 1024 * 1024; @@ -657,10 +657,16 @@ init_cacheinfo (void) } if (data > 0) - __x86_64_data_cache_size_half = data / 2; + { + /* Round data cache size to multiple of 256 bytes. */ + data = data & ~255L; + __x86_64_data_cache_size_half = data / 2; + } if (shared > 0) { + /* Round shared cache size to multiple of 256 bytes. */ + shared = shared & ~255L; __x86_64_shared_cache_size_half = shared / 2; __x86_64_shared_cache_size = shared; } |