This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH, testsuite] Fix PR34168 - fortran vectorized tests on x86 without support of SSE2
- From: Uros Bizjak <ubizjak at gmail dot com>
- To: Victor Kaplansky <VICTORK at il dot ibm dot com>
- Cc: GCC Patches <gcc-patches at gcc dot gnu dot org>, "Kaveh R. GHAZI" <ghazi at caip dot rutgers dot edu>
- Date: Thu, 20 Mar 2008 20:43:59 +0100
- Subject: Re: [PATCH, testsuite] Fix PR34168 - fortran vectorized tests on x86 without support of SSE2
- References: <OF0EF84BF1.11CD313B-ONC2257411.003FBCA6-C2257411.004095C7@il.ibm.com>
Victor Kaplansky wrote:
I agree. Do we want to make this reorganization as part of this PR or as
a separate patch? I prefer to fix PR and reorganize vect.exp later.
Victor,
I hope you don't mind that I took the liberty and extended your patch to
also include a synchronisation of various testsuite/*/vect.exp
target-dependent overrides and commit it to mainline by myself.
2008-03-20 Victor Kaplansky <victork@gcc.gnu.org>
Uros Bizjak <ubizjak@gmail.com>
PR testsuite/34168
* lib/target-supports.exp (check_sse2_hw_available): New procedure.
* gcc.dg/vect/vect.exp: Set dg-do-what-default to "compile"
if SSE2 hardware is not available.
* g++.dg/vect/vect.exp: Update target-dependent overrides to match
gcc.dg/vect/vect.exp.
* gfortran.dg/vect/vect.exp: Ditto.
(check_effective_target_lp64_or_vect_no_align): Remove procedure.
The patch was regression tested on x86_64-pc-linux-gnu {,-m32} and was
committed to mainline. I will commit similar patch to 4.3 tomorrow.
Thanks,
Uros.
Index: gcc.dg/vect/vect.exp
===================================================================
--- gcc.dg/vect/vect.exp (revision 133391)
+++ gcc.dg/vect/vect.exp (working copy)
@@ -63,7 +63,11 @@
set dg-do-what-default run
} elseif { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
lappend DEFAULT_VECTCFLAGS "-msse2"
- set dg-do-what-default run
+ if [check_sse2_hw_available] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
} elseif { [istarget "mips*-*-*"]
&& [check_effective_target_mpaired_single]
&& [check_effective_target_nomips16] } {
Index: g++.dg/vect/vect.exp
===================================================================
--- g++.dg/vect/vect.exp (revision 133391)
+++ g++.dg/vect/vect.exp (working copy)
@@ -45,7 +45,14 @@
# Skip these tests for targets that do not support generating vector
# code. Set additional target-dependent vector flags, which can be
# overridden by using dg-options in individual tests.
-if [istarget "powerpc*-*-*"] {
+if [istarget "powerpc-*paired*"] {
+ lappend DEFAULT_VECTCFLAGS "-mpaired"
+ if [check_750cl_hw_available] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
+} elseif [istarget "powerpc*-*-*"] {
# Skip targets not supporting -maltivec.
if ![is-effective-target powerpc_altivec_ok] {
return
@@ -53,19 +60,23 @@
lappend DEFAULT_VECTCFLAGS "-maltivec"
if [check_vmx_hw_available] {
- set dg-do-what-default run
+ set dg-do-what-default run
} else {
- if [is-effective-target ilp32] {
- # Specify a cpu that supports VMX for compile-only tests.
- lappend DEFAULT_VECTCFLAGS "-mcpu=7400"
- }
- set dg-do-what-default compile
+ if [is-effective-target ilp32] {
+ # Specify a cpu that supports VMX for compile-only tests.
+ lappend DEFAULT_VECTCFLAGS "-mcpu=970"
+ }
+ set dg-do-what-default compile
}
} elseif { [istarget "spu-*-*"] } {
set dg-do-what-default run
} elseif { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
lappend DEFAULT_VECTCFLAGS "-msse2"
- set dg-do-what-default run
+ if [check_sse2_hw_available] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
} elseif { [istarget "mips*-*-*"]
&& [check_effective_target_mpaired_single]
&& [check_effective_target_nomips16] } {
@@ -73,21 +84,37 @@
set dg-do-what-default run
} elseif [istarget "sparc*-*-*"] {
lappend DEFAULT_VECTCFLAGS "-mcpu=ultrasparc" "-mvis"
- set dg-do-what-default run
+ if [check_effective_target_ultrasparc_hw] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
} elseif [istarget "alpha*-*-*"] {
+ # Alpha's vectorization capabilities are extremely limited.
+ # It's more effort than its worth disabling all of the tests
+ # that it cannot pass. But if you actually want to see what
+ # does work, command out the return.
+ return
+
lappend DEFAULT_VECTCFLAGS "-mmax"
if [check_alpha_max_hw_available] {
- set dg-do-what-default run
+ set dg-do-what-default run
} else {
- set dg-do-what-default compile
+ set dg-do-what-default compile
}
} elseif [istarget "ia64-*-*"] {
set dg-do-what-default run
+} elseif [is-effective-target arm_neon_ok] {
+ lappend DEFAULT_VECTCFLAGS "-mfpu=neon" "-mfloat-abi=softfp"
+ if [is-effective-target arm_neon_hw] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
} else {
return
}
-
# Initialize `dg'.
dg-init
Index: lib/target-supports.exp
===================================================================
--- lib/target-supports.exp (revision 133391)
+++ lib/target-supports.exp (working copy)
@@ -764,6 +764,29 @@
}]
}
+# Return 1 if the target supports executing SSE2 instructions, 0
+# otherwise. Cache the result.
+
+proc check_sse2_hw_available { } {
+ return [check_cached_effective_target sse2_hw_available {
+ # If this is not the right target then we can skip the test.
+ if { !([istarget x86_64-*-*] || [istarget i?86-*-*]) } {
+ expr 0
+ } else {
+ check_runtime_nocache sse2_hw_available {
+ #include "cpuid.h"
+ int main ()
+ {
+ unsigned int eax, ebx, ecx, edx = 0;
+ if (__get_cpuid (1, &eax, &ebx, &ecx, &edx))
+ return !(edx & bit_SSE2);
+ return 1;
+ }
+ } ""
+ }
+ }]
+}
+
# Return 1 if the target supports executing AltiVec instructions, 0
# otherwise. Cache the result.
Index: gfortran.dg/vect/vect.exp
===================================================================
--- gfortran.dg/vect/vect.exp (revision 133391)
+++ gfortran.dg/vect/vect.exp (working copy)
@@ -38,8 +38,18 @@
# Skip these tests for targets that do not support generating vector
# code. Set additional target-dependent vector flags, which can be
# overridden by using dg-options in individual tests.
-if [istarget "powerpc*-*-*"] {
- # If there are powerpc targets to skip, do it here.
+if [istarget "powerpc-*paired*"] {
+ lappend DEFAULT_VECTCFLAGS "-mpaired"
+ if [check_750cl_hw_available] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
+} elseif [istarget "powerpc*-*-*"] {
+ # Skip targets not supporting -maltivec.
+ if ![is-effective-target powerpc_altivec_ok] {
+ return
+ }
lappend DEFAULT_VECTCFLAGS "-maltivec"
if [check_vmx_hw_available] {
@@ -47,20 +57,38 @@
} else {
if [is-effective-target ilp32] {
# Specify a cpu that supports VMX for compile-only tests.
- lappend DEFAULT_VECTCFLAGS "-mcpu=7400"
+ lappend DEFAULT_VECTCFLAGS "-mcpu=970"
}
set dg-do-what-default compile
}
+} elseif { [istarget "spu-*-*"] } {
+ set dg-do-what-default run
} elseif { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
lappend DEFAULT_VECTCFLAGS "-msse2"
- set dg-do-what-default run
-} elseif [istarget "mipsisa64*-*-*"] {
+ if [check_sse2_hw_available] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
+} elseif { [istarget "mips*-*-*"]
+ && [check_effective_target_mpaired_single]
+ && [check_effective_target_nomips16] } {
lappend DEFAULT_VECTCFLAGS "-mpaired-single"
set dg-do-what-default run
} elseif [istarget "sparc*-*-*"] {
lappend DEFAULT_VECTCFLAGS "-mcpu=ultrasparc" "-mvis"
- set dg-do-what-default run
+ if [check_effective_target_ultrasparc_hw] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
} elseif [istarget "alpha*-*-*"] {
+ # Alpha's vectorization capabilities are extremely limited.
+ # It's more effort than its worth disabling all of the tests
+ # that it cannot pass. But if you actually want to see what
+ # does work, command out the return.
+ return
+
lappend DEFAULT_VECTCFLAGS "-mmax"
if [check_alpha_max_hw_available] {
set dg-do-what-default run
@@ -69,23 +97,17 @@
}
} elseif [istarget "ia64-*-*"] {
set dg-do-what-default run
+} elseif [is-effective-target arm_neon_ok] {
+ lappend DEFAULT_VECTCFLAGS "-mfpu=neon" "-mfloat-abi=softfp"
+ if [is-effective-target arm_neon_hw] {
+ set dg-do-what-default run
+ } else {
+ set dg-do-what-default compile
+ }
} else {
return
}
-# Return 1 if the effective target is LP64 or if the effective target
-# does not support a vector alignment mechanism.
-
-proc check_effective_target_lp64_or_vect_no_align { } {
- if { [is-effective-target lp64]
- || [is-effective-target vect_no_align] } {
- set answer 1
- } else {
- set answer 0
- }
- return $answer
-}
-
# Initialize `dg'.
dg-init