Fix PR testsuite/116271, gcc.dg/vect/tsvc/vect-tsvc-s176.c fails

gcc/testsuite:
	PR testsuite/116271
	* gcc.dg/vect/tsvc/vect-tsvc-s176.c [TRUNCATE_TEST]: Make sure
	that m stays the same as the loop bound of the middle loop.
	* gcc.dg/vect/tsvc/tsvc.h (get_expected_result) <s176> [TRUNCATE_TEST]:
	Adjust expected value.

(cherry picked from commit beb94f5979953969593a2387561cdbc8fedfaeb1)

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 231af59dbcef8d71309b421caaae224baa38c47b..5f4a5e53cce938cf55b3c7b90dabbe8fe8ec96e2 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,5 +1,14 @@
 2025-04-02  Thomas Schwinge  <tschwinge@baylibre.com>
 
+       Backported from trunk:
+       2024-08-28  Joern Rennecke  <joern.rennecke@riscy-ip.com>
+
+       PR testsuite/116271
+       * gcc.dg/vect/tsvc/vect-tsvc-s176.c [TRUNCATE_TEST]: Make sure
+       that m stays the same as the loop bound of the middle loop.
+       * gcc.dg/vect/tsvc/tsvc.h (get_expected_result) <s176> [TRUNCATE_TEST]:
+       Adjust expected value.
+
        Backported from trunk:
        2024-08-07  Joern Rennecke  <joern.rennecke@riscy-ip.com>
 

diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
index cc02e4cacba1ed6a7b83de1bf87e40c440e95a15..4d295d1ec2961c25301d1b57f88297dc81f3f825 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/tsvc.h
@@ -1727,7 +1727,7 @@ real_t get_expected_result(const char * name)
 #ifndef TRUNCATE_TEST
         return 32021.121094f;
 #else /* TRUNCATE_TEST */
-        return 32024.082031f;
+        return 32023.751953f;
 #endif /* TRUNCATE_TEST */
 #endif /* iterations */
     } else {

diff --git a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c
index 6e9580582d54b275b8c13e19675f59af44b40781..626692bcb81d59a6a7f23e5bb1e766eb0da1dd48 100644 (file)
--- a/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c
+++ b/gcc/testsuite/gcc.dg/vect/tsvc/vect-tsvc-s176.c
@@ -15,18 +15,20 @@ real_t s176(struct args_t * func_args)
 
     initialise_arrays(__func__);
 
-    int m = LEN_1D/2;
 #ifdef TRUNCATE_TEST
-    /* Do something equivalent to if (1) which the compiler is unlikely to
-       figure out.
-       FUNC_ARGS is in the caller's frame, so it shouldn't be between A and B.
-     */
-    if ((void *)func_args <= (void *)a || (void *)func_args >= (void *)b)
-       m = 32;
+/* Reduce the iteration counts without changing what is a variable and
+   what is a constant expression.
+   32000/25 == 640, i.e. it still has a nice power of two factor, but is
+   not a power of two itself, and still somewhat large-ish, so hopefully
+   this won't perturb the vectorizer decisions much.  */
+#define M_CONST LEN_1D/50
+#else
+#define M_CONST LEN_1D/2
 #endif
+    int m = M_CONST;
     
     for (int nl = 0; nl < 4*(10*iterations/LEN_1D); nl++) {
-        for (int j = 0; j < (LEN_1D/2); j++) {
+        for (int j = 0; j < (M_CONST); j++) {
             for (int i = 0; i < m; i++) {
                 a[i] += b[i+m-j-1] * c[j];
             }