s390: Fix the default cache configuration. As z10-EC has an L3
cache, use that instead of the L2 -- bringing the code in synch
with documentation.
Also improve the warning message to be more meaningful.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12911 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/cachegrind/cg-s390x.c b/cachegrind/cg-s390x.c
index add8f33..3165efd 100644
--- a/cachegrind/cg-s390x.c
+++ b/cachegrind/cg-s390x.c
@@ -39,7 +39,7 @@
#include "cg_arch.h"
-void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* L2c,
+void VG_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* LLc,
Bool all_caches_clo_defined)
{
// z900
@@ -105,7 +105,7 @@
// fixs390: have a table for all available models and check /proc/cpuinfo
*I1c = (cache_t) { 65536, 4, 256 };
*D1c = (cache_t) { 131072, 8, 256 };
- *L2c = (cache_t) { 3145728, 12, 256 };
+ *LLc = (cache_t) {50331648, 24, 256 };
// Warn if config not completely specified from cmd line. Note that
// this message is slightly different from the one we give on x86/AMD64
@@ -118,8 +118,8 @@
// cachegrind/tests/filter_stderr!
//
if (!all_caches_clo_defined) {
- VG_(dmsg)("Warning: Cannot auto-detect cache config on s390x, using one "
- "or more defaults \n");
+ VG_(dmsg)("Warning: Cannot auto-detect cache config, "
+ "assuming z10-EC cache configuration\n");
}
}
diff --git a/cachegrind/tests/filter_stderr b/cachegrind/tests/filter_stderr
index 2d38fb3..0eeb91e 100755
--- a/cachegrind/tests/filter_stderr
+++ b/cachegrind/tests/filter_stderr
@@ -19,6 +19,6 @@
sed "/warning: L3 cache found, using its data for the LL simulation./d" |
sed "/Warning: Cannot auto-detect cache config on PPC.., using one or more defaults/d" |
sed "/Warning: Cannot auto-detect cache config on ARM, using one or more defaults/d" |
-sed "/Warning: Cannot auto-detect cache config on s390x, using one or more defaults/d" |
+sed "/Warning: Cannot auto-detect cache config, assuming z10-EC cache configuration/d" |
sed "/Warning: Cannot auto-detect cache config on MIPS.., using one or more defaults/d" |
sed "/warning: pretending that LL cache has associativity .*$/d"
