s390x: Make IBM z17 known to Valgrind

Make the IBM z17 machine model 9175 known to Valgrind.  Also add the
expected output of the s390x-specific "ecag" test case on an IBM z17, so
the test case succeeds on that system.

diff --git a/VEX/pub/libvex.h b/VEX/pub/libvex.h
index e580160d30a7fd00465f1321f9c561af568edc23..bfa94d033fcd5319afbcbf4358c74f93b295b031 100644 (file)
--- a/VEX/pub/libvex.h
+++ b/VEX/pub/libvex.h
@@ -158,7 +158,8 @@ typedef
 #define VEX_S390X_MODEL_Z14_ZR1  15
 #define VEX_S390X_MODEL_Z15      16
 #define VEX_S390X_MODEL_Z16      17
-#define VEX_S390X_MODEL_UNKNOWN  18     /* always last in list */
+#define VEX_S390X_MODEL_Z17      18
+#define VEX_S390X_MODEL_UNKNOWN  19     /* always last in list */
 #define VEX_S390X_MODEL_MASK     0x3F
 
 #define VEX_HWCAPS_S390X_LDISP (1<<6)   /* Long-displacement facility */

diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
index eaa18b0b61f018c6f5d13d1a07c97185b24ae960..bba498f98901edb1033aeea82d6fe27be87a6011 100644 (file)
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
@@ -624,6 +624,7 @@ static UInt VG_(get_machine_model)(void)
       { "8562", VEX_S390X_MODEL_Z15 },
       { "3931", VEX_S390X_MODEL_Z16 },
       { "3932", VEX_S390X_MODEL_Z16 },
+      { "9175", VEX_S390X_MODEL_Z17 },
    };
 
    Int    model, n, fh;

diff --git a/none/tests/s390x/Makefile.am b/none/tests/s390x/Makefile.am
index 22b8128bba1e5f42a36dbcbe6e4f048df54e2ed3..dda923acc62df2a7f296b059d4fe35e43194fe5e 100644 (file)
--- a/none/tests/s390x/Makefile.am
+++ b/none/tests/s390x/Makefile.am
@@ -48,7 +48,7 @@ EXTRA_DIST = \
        bfp-XxC.vgtest bfp-XxC.stderr.exp bfp-XxC.post.exp \
        ecag.stdout.exp-z10ec ecag.stdout.exp-z196 ecag.stdout.exp-zec12 \
        ecag.stdout.exp-z13 ecag.stdout.exp-z14 ecag.stdout.exp-z15 \
-       ecag.stdout.exp-z16 \
+       ecag.stdout.exp-z16 ecag.stdout.exp-z17 \
        op00.stderr.exp op00.vgtest \
        dfp-XxC.vgtest dfp-XxC.stderr.exp dfp-XxC.post.exp \
        dfp-XiC.vgtest dfp-XiC.stderr.exp dfp-XiC.post.exp \

diff --git a/none/tests/s390x/ecag.stdout.exp-z17 b/none/tests/s390x/ecag.stdout.exp-z17
new file mode 100644 (file)
index 0000000..4708b2a
--- /dev/null
+++ b/none/tests/s390x/ecag.stdout.exp-z17
@@ -0,0 +1,21 @@
+L1 topology: separate data and instruction; private
+L1 cache line size data: 256
+L1 cache line size insn: 256
+L1 total cachesize data: 131072
+L1 total cachesize insn: 131072
+L1 set. assoc.     data: 8
+L1 set. assoc.     insn: 8
+L2 topology: unified data and instruction; private
+L2 cache line size data: 256
+L2 cache line size insn: 256
+L2 total cachesize data: 37748736
+L2 total cachesize insn: 37748736
+L2 set. assoc.     data: 18
+L2 set. assoc.     insn: 18
+L3 topology: unified data and instruction; shared
+L3 cache line size data: 256
+L3 cache line size insn: 256
+L3 total cachesize data: 377487360
+L3 total cachesize insn: 377487360
+L3 set. assoc.     data: 180
+L3 set. assoc.     insn: 180

diff --git a/tests/s390x_features.c b/tests/s390x_features.c
index 507f3ab2f8ce6cc6cbfafa955095f42a0cad0e74..e0d4de76ce5a1e6764cb515ab790b1d8a429fc2e 100644 (file)
--- a/tests/s390x_features.c
+++ b/tests/s390x_features.c
@@ -120,6 +120,7 @@ model_info models[] = {
    { "8562", "z15"    },
    { "3931", "z16"    },
    { "3932", "z16"    },
+   { "9175", "z17"    },
 };