From 045f94d62cee4ec1fb442d5c2d10cd091a21c208 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Wed, 27 Jul 2011 17:54:59 +0200 Subject: [PATCH] avx-os-support.h: New. * gcc.target/i386/avx-os-support.h: New. * gcc.target/i386/avx-check.h: Include avx-os-support.h (main): Check avx_os_support before the test is run. * gcc.target/i386/aes-avx-check.h: Ditto. * gcc.target/i386/pclmul-avx-check.h: Ditto. From-SVN: r176832 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.target/i386/aes-avx-check.h | 5 ++++- gcc/testsuite/gcc.target/i386/avx-check.h | 4 +++- gcc/testsuite/gcc.target/i386/avx-os-support.h | 10 ++++++++++ gcc/testsuite/gcc.target/i386/pclmul-avx-check.h | 5 ++++- 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/avx-os-support.h diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 228a5d82727b..13b73d7ad28c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2011-07-27 Uros Bizjak + + * gcc.target/i386/avx-os-support.h: New. + * gcc.target/i386/avx-check.h: Include avx-os-support.h + (main): Check avx_os_support before the test is run. + * gcc.target/i386/aes-avx-check.h: Ditto. + * gcc.target/i386/pclmul-avx-check.h: Ditto. + 2011-07-22 Uros Bizjak * lib/target-supports.exp (check_avx_os_support_available): New. diff --git a/gcc/testsuite/gcc.target/i386/aes-avx-check.h b/gcc/testsuite/gcc.target/i386/aes-avx-check.h index e73e36eab257..96305fbb3ef1 100644 --- a/gcc/testsuite/gcc.target/i386/aes-avx-check.h +++ b/gcc/testsuite/gcc.target/i386/aes-avx-check.h @@ -3,6 +3,7 @@ #endif #include #include "cpuid.h" +#include "avx-os-support.h" static void aes_avx_test (void); @@ -15,7 +16,9 @@ main () return 0; /* Run AES + AVX test only if host has AES + AVX support. */ - if ((ecx & (bit_AVX | bit_AES)) == (bit_AVX | bit_AES)) + if (((ecx & (bit_AVX | bit_OSXSAVE | bit_AES)) + == (bit_AVX | bit_OSXSAVE | bit_AES)) + && avx_os_support ()) { aes_avx_test (); #ifdef DEBUG diff --git a/gcc/testsuite/gcc.target/i386/avx-check.h b/gcc/testsuite/gcc.target/i386/avx-check.h index 491da8b4c4fa..c094eddfb99c 100644 --- a/gcc/testsuite/gcc.target/i386/avx-check.h +++ b/gcc/testsuite/gcc.target/i386/avx-check.h @@ -1,6 +1,7 @@ #include #include "cpuid.h" #include "m256-check.h" +#include "avx-os-support.h" static void avx_test (void); @@ -13,7 +14,8 @@ main () return 0; /* Run AVX test only if host has AVX support. */ - if ((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE)) + if (((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE)) + && avx_os_support ()) { avx_test (); #ifdef DEBUG diff --git a/gcc/testsuite/gcc.target/i386/avx-os-support.h b/gcc/testsuite/gcc.target/i386/avx-os-support.h new file mode 100644 index 000000000000..21d332f7d3d8 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/avx-os-support.h @@ -0,0 +1,10 @@ +/* Check if the OS supports executing AVX instructions. */ + +static int +avx_os_support (void) +{ + unsigned int eax, edx; + + __asm__ ("xgetbv" : "=a" (eax), "=d" (edx) : "c" (0)); + return (eax & 6) == 6; +} diff --git a/gcc/testsuite/gcc.target/i386/pclmul-avx-check.h b/gcc/testsuite/gcc.target/i386/pclmul-avx-check.h index de6333361571..3eb84b86ddf2 100644 --- a/gcc/testsuite/gcc.target/i386/pclmul-avx-check.h +++ b/gcc/testsuite/gcc.target/i386/pclmul-avx-check.h @@ -3,6 +3,7 @@ #endif #include #include "cpuid.h" +#include "avx-os-support.h" static void pclmul_avx_test (void); @@ -15,7 +16,9 @@ main () return 0; /* Run PCLMUL + AVX test only if host has PCLMUL + AVX support. */ - if ((ecx & (bit_AVX | bit_PCLMUL)) == (bit_AVX | bit_PCLMUL)) + if (((ecx & (bit_AVX | bit_OSXSAVE | bit_PCLMUL)) + == (bit_AVX | bit_OSXSAVE | bit_PCLMUL)) + && avx_os_support ()) { pclmul_avx_test (); #ifdef DEBUG -- 2.47.2