From: Richard Biener Date: Thu, 12 Feb 2026 10:08:53 +0000 (+0100) Subject: Move gcc.dg/vect/vec-scal-*.c and simplify globbing of the rest X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb61a50316988768f13825c98f2860b8747fb9d;p=thirdparty%2Fgcc.git Move gcc.dg/vect/vec-scal-*.c and simplify globbing of the rest The following creates a subdirectory gcc.dg/vect/veclower/ and moves the vector lowering tests vec-scal-*.c there. This simplifies globbing of gcc.dg/vect/ testcases, partitioning them into bb-slp-*.c and non-bb-slp-*.c sets. I needed to rename bb-slp files in complex/ and skip templates that are just included there. * gcc.dg/vect/vect.exp: Adjust vec-scal-*.c glob. Merge globbing of non-bb-slp-*.c tests to a *.c glob excluding bb-slp-*.c. * gcc.dg/vect/vec-scal-opt.c: Move ... * gcc.dg/vect/veclower/vec-scal-opt.c: ... here. * gcc.dg/vect/vec-scal-opt1.c: Move ... * gcc.dg/vect/veclower/vec-scal-opt1.c: ... here. * gcc.dg/vect/vec-scal-opt2.c: Move ... * gcc.dg/vect/veclower/vec-scal-opt2.c: ... here. * gcc.dg/vect/complex/fast-math-bb-slp-complex-add-double.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-add-double.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-add-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-add-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-add-half-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-add-half-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-double.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-add-pattern-double.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-add-pattern-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-half-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-add-pattern-half-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-double.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mla-double.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mla-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-half-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mla-half-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-double.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mls-double.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mls-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-half-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mls-half-float.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-double.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mul-double.c: ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mul-float.c : ... this. * gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-half-float.c: Rename to ... * gcc.dg/vect/complex/bb-slp-complex-mul-half-float.c: ... this. * gcc.dg/vect/complex/complex-add-pattern-template.c: Skip. * gcc.dg/vect/complex/complex-add-template.c: Skip. * gcc.dg/vect/complex/complex-mla-template.c: Skip. * gcc.dg/vect/complex/complex-mls-template.c: Skip. * gcc.dg/vect/complex/complex-mul-template.c: Skip. * gcc.dg/vect/complex/complex-operations.c: Skip. --- diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-double.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-double.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-double.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-double.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-half-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-half-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-half-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-half-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-double.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-pattern-double.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-double.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-pattern-double.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-pattern-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-pattern-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-half-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-pattern-half-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-add-pattern-half-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-add-pattern-half-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-double.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mla-double.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-double.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mla-double.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mla-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mla-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-half-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mla-half-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mla-half-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mla-half-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-double.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mls-double.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-double.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mls-double.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mls-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mls-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-half-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mls-half-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mls-half-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mls-half-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-double.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mul-double.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-double.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mul-double.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mul-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mul-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-half-float.c b/gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mul-half-float.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/complex/fast-math-bb-slp-complex-mul-half-float.c rename to gcc/testsuite/gcc.dg/vect/complex/bb-slp-complex-mul-half-float.c diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-add-pattern-template.c b/gcc/testsuite/gcc.dg/vect/complex/complex-add-pattern-template.c index 9b9f0a4a7d8e..67741f581767 100644 --- a/gcc/testsuite/gcc.dg/vect/complex/complex-add-pattern-template.c +++ b/gcc/testsuite/gcc.dg/vect/complex/complex-add-pattern-template.c @@ -1,3 +1,5 @@ +/* { dg-skip-if "template file" { *-*-* } } */ + void add90 (TYPE a[restrict N], TYPE b[restrict N], TYPE c[restrict N]) { #if defined (UNROLL) diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-add-template.c b/gcc/testsuite/gcc.dg/vect/complex/complex-add-template.c index 3870196b9fb2..976e7331dc01 100644 --- a/gcc/testsuite/gcc.dg/vect/complex/complex-add-template.c +++ b/gcc/testsuite/gcc.dg/vect/complex/complex-add-template.c @@ -1,3 +1,5 @@ +/* { dg-skip-if "template file" { *-*-* } } */ + #include void add0 (_Complex TYPE a[restrict N], _Complex TYPE b[restrict N], diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-mla-template.c b/gcc/testsuite/gcc.dg/vect/complex/complex-mla-template.c index 4b5c42b29f1b..693cfd4b35f1 100644 --- a/gcc/testsuite/gcc.dg/vect/complex/complex-mla-template.c +++ b/gcc/testsuite/gcc.dg/vect/complex/complex-mla-template.c @@ -1,3 +1,5 @@ +/* { dg-skip-if "template file" { *-*-* } } */ + #include void fma0 (_Complex TYPE a[restrict N], _Complex TYPE b[restrict N], diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-mls-template.c b/gcc/testsuite/gcc.dg/vect/complex/complex-mls-template.c index 1954be8b06ad..af4517f2b206 100644 --- a/gcc/testsuite/gcc.dg/vect/complex/complex-mls-template.c +++ b/gcc/testsuite/gcc.dg/vect/complex/complex-mls-template.c @@ -1,3 +1,5 @@ +/* { dg-skip-if "template file" { *-*-* } } */ + #include void fms0 (_Complex TYPE a[restrict N], _Complex TYPE b[restrict N], diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-mul-template.c b/gcc/testsuite/gcc.dg/vect/complex/complex-mul-template.c index 770565c4509c..1245e42cde84 100644 --- a/gcc/testsuite/gcc.dg/vect/complex/complex-mul-template.c +++ b/gcc/testsuite/gcc.dg/vect/complex/complex-mul-template.c @@ -1,3 +1,5 @@ +/* { dg-skip-if "template file" { *-*-* } } */ + #include void mul0 (_Complex TYPE a[restrict N], _Complex TYPE b[restrict N], diff --git a/gcc/testsuite/gcc.dg/vect/complex/complex-operations.c b/gcc/testsuite/gcc.dg/vect/complex/complex-operations.c index fdce995481d2..0a79a175605a 100644 --- a/gcc/testsuite/gcc.dg/vect/complex/complex-operations.c +++ b/gcc/testsuite/gcc.dg/vect/complex/complex-operations.c @@ -1,3 +1,5 @@ +/* { dg-skip-if "template file" { *-*-* } } */ + #include #include diff --git a/gcc/testsuite/gcc.dg/vect/vec-scal-opt.c b/gcc/testsuite/gcc.dg/vect/veclower/vec-scal-opt.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/vec-scal-opt.c rename to gcc/testsuite/gcc.dg/vect/veclower/vec-scal-opt.c diff --git a/gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c b/gcc/testsuite/gcc.dg/vect/veclower/vec-scal-opt1.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/vec-scal-opt1.c rename to gcc/testsuite/gcc.dg/vect/veclower/vec-scal-opt1.c diff --git a/gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c b/gcc/testsuite/gcc.dg/vect/veclower/vec-scal-opt2.c similarity index 100% rename from gcc/testsuite/gcc.dg/vect/vec-scal-opt2.c rename to gcc/testsuite/gcc.dg/vect/veclower/vec-scal-opt2.c diff --git a/gcc/testsuite/gcc.dg/vect/vect.exp b/gcc/testsuite/gcc.dg/vect/vect.exp index 025c3360c0d4..958156b6ae01 100644 --- a/gcc/testsuite/gcc.dg/vect/vect.exp +++ b/gcc/testsuite/gcc.dg/vect/vect.exp @@ -59,7 +59,7 @@ lappend DEFAULT_VECTCFLAGS "-O2" # "-O -fdump-tree-veclower2" lappend VEC_FLAGS "-O" "-fdump-tree-veclower2" et-dg-runtest dg-runtest [lsort [glob -nocomplain \ - $srcdir/$subdir/vec-scal-*.\[cS\]]] \ + $srcdir/$subdir/veclower/*.\[cS\]]] \ "" $VEC_FLAGS set VECT_SLP_CFLAGS $DEFAULT_VECTCFLAGS @@ -73,60 +73,20 @@ if { [check_effective_target_lto] } { lappend VECT_ADDITIONAL_FLAGS "-flto -ffat-lto-objects" } foreach flags $VECT_ADDITIONAL_FLAGS { - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/pr*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/vect-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS + set tests "" + foreach file [glob -nocomplain $srcdir/$subdir/*.\[cS\]] { + if { ! [string match $srcdir/$subdir/bb-slp-*.\[cS\] $file] } { + lappend tests $file + } + } + et-dg-runtest dg-runtest $tests $flags $DEFAULT_VECTCFLAGS + et-dg-runtest dg-runtest [lsort \ [glob -nocomplain $srcdir/$subdir/tsvc/*.\[cS\]]] \ $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/slp-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/no-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/fast-math-\[ipsvc\]*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/wrapv-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/trapv-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/unswitch-loops-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/ggc-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/Os-vect-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/O3-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/O1-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/O-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/section-anchors-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/aligned-section-anchors-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS - et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/nodump-*.\[cS\]]] \ - $flags $DEFAULT_VECTCFLAGS et-dg-runtest dg-runtest [lsort \ - [glob -nocomplain $srcdir/$subdir/bb-slp*.\[cS\]]] \ + [glob -nocomplain $srcdir/$subdir/bb-slp-*.\[cS\]]] \ $flags $VECT_SLP_CFLAGS }