From: Carl Love Date: Mon, 20 Jul 2015 19:36:53 +0000 (+0000) Subject: Patch 2 of 7, improve PPC HW capabiltiy checking. X-Git-Tag: svn/VALGRIND_3_11_0~226 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c1cc04641a03d65d8b07c4a89f250dc4487d33a;p=thirdparty%2Fvalgrind.git Patch 2 of 7, improve PPC HW capabiltiy checking. The patch was submitted by Will Schmidt (will_schmidt@vnet.ibm.com). Update all vgtest files to reference the new capability check helper. This includes a few adjustments to ensure the test is checking for the specific capability. I.e. isa_2_07 is a requirement for htm, but does not indicate htm support is actually present. Bugzilla 34979 git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15421 --- diff --git a/memcheck/tests/ppc32/power_ISA2_07.vgtest b/memcheck/tests/ppc32/power_ISA2_07.vgtest index 9a43785037..fa34a1e153 100644 --- a/memcheck/tests/ppc32/power_ISA2_07.vgtest +++ b/memcheck/tests/ppc32/power_ISA2_07.vgtest @@ -1,3 +1,3 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: power_ISA2_07 -vgopts: +vgopts: diff --git a/memcheck/tests/ppc64/power_ISA2_07.vgtest b/memcheck/tests/ppc64/power_ISA2_07.vgtest index 63ba88f5da..fa34a1e153 100644 --- a/memcheck/tests/ppc64/power_ISA2_07.vgtest +++ b/memcheck/tests/ppc64/power_ISA2_07.vgtest @@ -1,3 +1,3 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: power_ISA2_07 vgopts: diff --git a/none/tests/ppc32/bug129390-ppc32.vgtest b/none/tests/ppc32/bug129390-ppc32.vgtest index d7d05b3c76..13165fc5fd 100644 --- a/none/tests/ppc32/bug129390-ppc32.vgtest +++ b/none/tests/ppc32/bug129390-ppc32.vgtest @@ -1,3 +1,3 @@ -prereq: ../../../tests/check_vmx_cap +prereq: ../../../tests/check_ppc64_auxv_cap altivec prog: bug129390-ppc32 vgopts: -q diff --git a/none/tests/ppc32/jm-vmx.vgtest b/none/tests/ppc32/jm-vmx.vgtest index 183536b562..d29d397e14 100644 --- a/none/tests/ppc32/jm-vmx.vgtest +++ b/none/tests/ppc32/jm-vmx.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_vmx_cap +prereq: ../../../tests/check_ppc64_auxv_cap altivec prog: jm-insns -a diff --git a/none/tests/ppc32/jm_fp_isa_2_07.vgtest b/none/tests/ppc32/jm_fp_isa_2_07.vgtest index a61616cf76..dd846e0d05 100644 --- a/none/tests/ppc32/jm_fp_isa_2_07.vgtest +++ b/none/tests/ppc32/jm_fp_isa_2_07.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part1 -f diff --git a/none/tests/ppc32/jm_int_isa_2_07.vgtest b/none/tests/ppc32/jm_int_isa_2_07.vgtest index f1f6c481e9..0bf9d8bab0 100644 --- a/none/tests/ppc32/jm_int_isa_2_07.vgtest +++ b/none/tests/ppc32/jm_int_isa_2_07.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part1 -i diff --git a/none/tests/ppc32/jm_vec_isa_2_07.vgtest b/none/tests/ppc32/jm_vec_isa_2_07.vgtest index f69c126e64..dc9522013c 100644 --- a/none/tests/ppc32/jm_vec_isa_2_07.vgtest +++ b/none/tests/ppc32/jm_vec_isa_2_07.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap && ! ../../../tests/check_ppc64le_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part1 -a diff --git a/none/tests/ppc32/testVMX.vgtest b/none/tests/ppc32/testVMX.vgtest index 81c59f2012..b36dbcba6a 100644 --- a/none/tests/ppc32/testVMX.vgtest +++ b/none/tests/ppc32/testVMX.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_vmx_cap +prereq: ../../../tests/check_ppc64_auxv_cap altivec prog: testVMX diff --git a/none/tests/ppc32/test_dfp1.vgtest b/none/tests/ppc32/test_dfp1.vgtest index 0efe5dfd1d..71af5fa640 100644 --- a/none/tests/ppc32/test_dfp1.vgtest +++ b/none/tests/ppc32/test_dfp1.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp1 diff --git a/none/tests/ppc32/test_dfp2.vgtest b/none/tests/ppc32/test_dfp2.vgtest index 7fe6c16f0a..23a1f00ede 100644 --- a/none/tests/ppc32/test_dfp2.vgtest +++ b/none/tests/ppc32/test_dfp2.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp2 diff --git a/none/tests/ppc32/test_dfp3.vgtest b/none/tests/ppc32/test_dfp3.vgtest index 39168a36a7..e806e85e21 100644 --- a/none/tests/ppc32/test_dfp3.vgtest +++ b/none/tests/ppc32/test_dfp3.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp3 diff --git a/none/tests/ppc32/test_dfp4.vgtest b/none/tests/ppc32/test_dfp4.vgtest index dac33568bf..7688eb8ac9 100644 --- a/none/tests/ppc32/test_dfp4.vgtest +++ b/none/tests/ppc32/test_dfp4.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp4 diff --git a/none/tests/ppc32/test_dfp5.vgtest b/none/tests/ppc32/test_dfp5.vgtest index 9777d05117..0c905d8d9e 100644 --- a/none/tests/ppc32/test_dfp5.vgtest +++ b/none/tests/ppc32/test_dfp5.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp5 diff --git a/none/tests/ppc32/test_isa_2_06_part1.vgtest b/none/tests/ppc32/test_isa_2_06_part1.vgtest index 512a218124..29e9d06459 100644 --- a/none/tests/ppc32/test_isa_2_06_part1.vgtest +++ b/none/tests/ppc32/test_isa_2_06_part1.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_06_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06 prog: test_isa_2_06_part1 diff --git a/none/tests/ppc32/test_isa_2_06_part2.vgtest b/none/tests/ppc32/test_isa_2_06_part2.vgtest index 7ae01beb87..7783c5e43f 100644 --- a/none/tests/ppc32/test_isa_2_06_part2.vgtest +++ b/none/tests/ppc32/test_isa_2_06_part2.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_06_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06 prog: test_isa_2_06_part2 diff --git a/none/tests/ppc32/test_isa_2_06_part3.vgtest b/none/tests/ppc32/test_isa_2_06_part3.vgtest index 3519c8a055..e4ccfeeab2 100644 --- a/none/tests/ppc32/test_isa_2_06_part3.vgtest +++ b/none/tests/ppc32/test_isa_2_06_part3.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_06_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06 prog: test_isa_2_06_part3 diff --git a/none/tests/ppc32/test_isa_2_07_part2.vgtest b/none/tests/ppc32/test_isa_2_07_part2.vgtest index a4649be9f4..8108796a9a 100644 --- a/none/tests/ppc32/test_isa_2_07_part2.vgtest +++ b/none/tests/ppc32/test_isa_2_07_part2.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part2 diff --git a/none/tests/ppc32/test_tm.vgtest b/none/tests/ppc32/test_tm.vgtest index 977c326a52..f258077153 100644 --- a/none/tests/ppc32/test_tm.vgtest +++ b/none/tests/ppc32/test_tm.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap htm prog: test_tm diff --git a/none/tests/ppc32/test_touch_tm.vgtest b/none/tests/ppc32/test_touch_tm.vgtest index 4806ccfae5..50409b7c2f 100644 --- a/none/tests/ppc32/test_touch_tm.vgtest +++ b/none/tests/ppc32/test_touch_tm.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap htm prog: test_touch_tm diff --git a/none/tests/ppc64/jm-vmx.vgtest b/none/tests/ppc64/jm-vmx.vgtest index 183536b562..d29d397e14 100644 --- a/none/tests/ppc64/jm-vmx.vgtest +++ b/none/tests/ppc64/jm-vmx.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_vmx_cap +prereq: ../../../tests/check_ppc64_auxv_cap altivec prog: jm-insns -a diff --git a/none/tests/ppc64/jm_fp_isa_2_07.vgtest b/none/tests/ppc64/jm_fp_isa_2_07.vgtest index a61616cf76..dd846e0d05 100644 --- a/none/tests/ppc64/jm_fp_isa_2_07.vgtest +++ b/none/tests/ppc64/jm_fp_isa_2_07.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part1 -f diff --git a/none/tests/ppc64/jm_int_isa_2_07.vgtest b/none/tests/ppc64/jm_int_isa_2_07.vgtest index f1f6c481e9..0bf9d8bab0 100644 --- a/none/tests/ppc64/jm_int_isa_2_07.vgtest +++ b/none/tests/ppc64/jm_int_isa_2_07.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part1 -i diff --git a/none/tests/ppc64/jm_vec_isa_2_07.vgtest b/none/tests/ppc64/jm_vec_isa_2_07.vgtest index a93060a0b9..dc9522013c 100644 --- a/none/tests/ppc64/jm_vec_isa_2_07.vgtest +++ b/none/tests/ppc64/jm_vec_isa_2_07.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part1 -a diff --git a/none/tests/ppc64/test_dfp1.vgtest b/none/tests/ppc64/test_dfp1.vgtest index 0efe5dfd1d..71af5fa640 100644 --- a/none/tests/ppc64/test_dfp1.vgtest +++ b/none/tests/ppc64/test_dfp1.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp1 diff --git a/none/tests/ppc64/test_dfp2.vgtest b/none/tests/ppc64/test_dfp2.vgtest index 7fe6c16f0a..23a1f00ede 100644 --- a/none/tests/ppc64/test_dfp2.vgtest +++ b/none/tests/ppc64/test_dfp2.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp2 diff --git a/none/tests/ppc64/test_dfp3.vgtest b/none/tests/ppc64/test_dfp3.vgtest index 39168a36a7..e806e85e21 100644 --- a/none/tests/ppc64/test_dfp3.vgtest +++ b/none/tests/ppc64/test_dfp3.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp3 diff --git a/none/tests/ppc64/test_dfp4.vgtest b/none/tests/ppc64/test_dfp4.vgtest index dac33568bf..7688eb8ac9 100644 --- a/none/tests/ppc64/test_dfp4.vgtest +++ b/none/tests/ppc64/test_dfp4.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp4 diff --git a/none/tests/ppc64/test_dfp5.vgtest b/none/tests/ppc64/test_dfp5.vgtest index 9777d05117..0c905d8d9e 100644 --- a/none/tests/ppc64/test_dfp5.vgtest +++ b/none/tests/ppc64/test_dfp5.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_dfp_cap +prereq: ../../../tests/check_ppc64_auxv_cap dfp prog: test_dfp5 diff --git a/none/tests/ppc64/test_isa_2_06_part1.vgtest b/none/tests/ppc64/test_isa_2_06_part1.vgtest index 512a218124..29e9d06459 100644 --- a/none/tests/ppc64/test_isa_2_06_part1.vgtest +++ b/none/tests/ppc64/test_isa_2_06_part1.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_06_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06 prog: test_isa_2_06_part1 diff --git a/none/tests/ppc64/test_isa_2_06_part2.vgtest b/none/tests/ppc64/test_isa_2_06_part2.vgtest index 7ae01beb87..7783c5e43f 100644 --- a/none/tests/ppc64/test_isa_2_06_part2.vgtest +++ b/none/tests/ppc64/test_isa_2_06_part2.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_06_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06 prog: test_isa_2_06_part2 diff --git a/none/tests/ppc64/test_isa_2_06_part3.vgtest b/none/tests/ppc64/test_isa_2_06_part3.vgtest index 3519c8a055..e4ccfeeab2 100644 --- a/none/tests/ppc64/test_isa_2_06_part3.vgtest +++ b/none/tests/ppc64/test_isa_2_06_part3.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_06_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_06 prog: test_isa_2_06_part3 diff --git a/none/tests/ppc64/test_isa_2_07_part2.vgtest b/none/tests/ppc64/test_isa_2_07_part2.vgtest index a4649be9f4..8108796a9a 100644 --- a/none/tests/ppc64/test_isa_2_07_part2.vgtest +++ b/none/tests/ppc64/test_isa_2_07_part2.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap arch_2_07 prog: test_isa_2_07_part2 diff --git a/none/tests/ppc64/test_tm.vgtest b/none/tests/ppc64/test_tm.vgtest index 977c326a52..f258077153 100644 --- a/none/tests/ppc64/test_tm.vgtest +++ b/none/tests/ppc64/test_tm.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap htm prog: test_tm diff --git a/none/tests/ppc64/test_touch_tm.vgtest b/none/tests/ppc64/test_touch_tm.vgtest index 4806ccfae5..50409b7c2f 100644 --- a/none/tests/ppc64/test_touch_tm.vgtest +++ b/none/tests/ppc64/test_touch_tm.vgtest @@ -1,2 +1,2 @@ -prereq: ../../../tests/check_isa-2_07_cap +prereq: ../../../tests/check_ppc64_auxv_cap htm prog: test_touch_tm