Hi all,
I did an ooppsie with the patch for 107635. Attached is a patch that fixes
this. Essentially the regexp was to complicated for what was needed. So now we
just count the number of occurrences of caf_get_by_ct, which has to be four.
Regtests ok on x86_64-pc-linux-gnu. Ok for mainline?
Regards,
Andre
On Mon, 23 Dec 2024 04:52:50 +0800
"haochen.jiang" <haoch...@smtp.intel.com> wrote:
> On Linux/x86_64,
>
> 586477d67bf2e320e8ec41f82b194259c1dcc43a is the first bad commit
> commit 586477d67bf2e320e8ec41f82b194259c1dcc43a
> Author: Andre Vehreschild <ve...@gcc.gnu.org>
> Date: Fri Dec 6 08:57:34 2024 +0100
>
> Fortran: Replace getting of coarray data with accessor-based version.
> [PR107635]
>
> caused
>
> FAIL: gfortran.dg/coarray_lib_comm_1.f90 -O0 scan-tree-dump-times
> original "_gfortran_caf_get_by_ct \\(caf_token.., 0B, 0B, 1, \\(unsigned
> long\\) atmp.[0-9]+.span" 4 FAIL: gfortran.dg/coarray_lib_comm_1.f90 -O1
> scan-tree-dump-times original "_gfortran_caf_get_by_ct \\(caf_token.., 0B,
> 0B, 1, \\(unsigned long\\) atmp.[0-9]+.span" 4 FAIL:
> gfortran.dg/coarray_lib_comm_1.f90 -O2 scan-tree-dump-times original
> "_gfortran_caf_get_by_ct \\(caf_token.., 0B, 0B, 1, \\(unsigned long\\)
> atmp.[0-9]+.span" 4 FAIL: gfortran.dg/coarray_lib_comm_1.f90 -O3
> -fomit-frame-pointer -funroll-loops -fpeel-loops -ftracer -finline-functions
> scan-tree-dump-times original "_gfortran_caf_get_by_ct \\(caf_token.., 0B,
> 0B, 1, \\(unsigned long\\) atmp.[0-9]+.span" 4 FAIL:
> gfortran.dg/coarray_lib_comm_1.f90 -O3 -g scan-tree-dump-times original
> "_gfortran_caf_get_by_ct \\(caf_token.., 0B, 0B, 1, \\(unsigned long\\)
> atmp.[0-9]+.span" 4 FAIL: gfortran.dg/coarray_lib_comm_1.f90 -Os
> scan-tree-dump-times original "_gfortran_caf_get_by_ct \\(caf_token.., 0B,
> 0B, 1, \\(unsigned long\\) atmp.[0-9]+.span" 4
>
> with GCC configured with
>
> ../../gcc/configure
> --prefix=/export/users/haochenj/src/gcc-bisect/master/master/r15-6415/usr
> --enable-clocale=gnu --with-system-zlib --with-demangler-in-ld
> --with-fpmath=sse --enable-languages=c,c++,fortran --enable-cet --without-isl
> --enable-libmpx x86_64-linux --disable-bootstrap
>
> To reproduce:
>
> $ cd {build_dir}/gcc && make check
> RUNTESTFLAGS="dg.exp=gfortran.dg/coarray_lib_comm_1.f90
> --target_board='unix{-m32}'" $ cd {build_dir}/gcc && make check
> RUNTESTFLAGS="dg.exp=gfortran.dg/coarray_lib_comm_1.f90
> --target_board='unix{-m32\ -march=cascadelake}'"
>
> (Please do not reply to this email, for question about this report, contact
> me at haochen dot jiang at intel.com.) (If you met problems with cascadelake
> related, disabling AVX512F in command line might save that.) (However, please
> make sure that there is no potential problems with AVX512.)
--
Andre Vehreschild * Email: vehre ad gmx dot de
From b64c97530fc46b9c750a035925e14c77b2574d65 Mon Sep 17 00:00:00 2001
From: Andre Vehreschild <ve...@gcc.gnu.org>
Date: Mon, 23 Dec 2024 15:01:30 +0100
Subject: [PATCH] Fortran: Fixup broken build on 32bit after r15-6415
[PR107635]
gcc/testsuite/ChangeLog:
PR fortran/107635
* gfortran.dg/coarray_lib_comm_1.f90: Use less complicated
pattern, because all we need is the right count.
---
gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90 b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
index 68aa47ecd32..609f3c10cef 100644
--- a/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
+++ b/gcc/testsuite/gfortran.dg/coarray_lib_comm_1.f90
@@ -38,6 +38,6 @@ B(1:5) = B(3:7)
if (any (A-B /= 0)) STOP 4
end
-! { dg-final { scan-tree-dump-times "_gfortran_caf_get_by_ct \\\(caf_token.., 0B, 0B, 1, \\\(unsigned long\\\) atmp.\[0-9\]+.span" 4 "original" } }
+! { dg-final { scan-tree-dump-times "_gfortran_caf_get_by_ct" 4 "original" } }
! { dg-final { scan-tree-dump-times "_gfortran_caf_sendget \\\(caf_token.., \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, caf_token.., \\\(integer\\\(kind=\[48\]\\\)\\\) parm.\[0-9\]+.data - \\\(integer\\\(kind=\[48\]\\\)\\\) a, 1, &parm.\[0-9\]+, 0B, 4, 4, 1, 0B\\\);" 1 "original" } }
--
2.47.1
