linaro-toolchain

linaro-toolchain@lists.linaro.org

4 participants
5637 discussions

[CI-NOTIFY]: TCWG Bisect tcwg_cross/gnu-master-aarch64-build_cross - Build # 20 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *glibc* in CI configuration tcwg_cross/gnu-master-aarch64-build_cross. So far, this commit has regressed CI configurations: - tcwg_cross/gnu-master-aarch64-build_cross Culprit: <cut> commit c8935581de4ff931bc32fb03da5d87f0ee2378a1 Author: Khem Raj <raj.khem(a)gmail.com> Date: Fri Jul 2 13:28:10 2021 -0700 linux: Check for null value msghdr struct before use This avoids crashes in libc when cmsg is null and refrencing msg structure when it is null Signed-off-by: Khem Raj <raj.khem(a)gmail.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella(a)linaro.org> </cut> Results regressed to (for first_bad == c8935581de4ff931bc32fb03da5d87f0ee2378a1) # reset_artifacts: -10 # true: 0 # build_abe binutils: 1 # build_abe stage1: 2 # build_abe linux: 3 # First few build errors in logs: # 00:00:14 make[2]: *** [/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/sysd-rules:499: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/start.os] Error 1 # 00:00:14 make[2]: *** [/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/sysd-rules:483: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/crti.o] Error 1 # 00:00:14 make[2]: *** [/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/sysd-rules:483: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/start.o] Error 1 # 00:00:14 make[2]: *** [/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/sysd-rules:483: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/crtn.o] Error 1 # 00:00:14 make[2]: *** [../o-iterator.mk:9: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/check_fds.os] Error 1 # 00:00:14 make[2]: *** [../o-iterator.mk:9: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/check_fds.o] Error 1 # 00:00:14 ../sysdeps/aarch64/nptl/tls.h:91:19: error: ‘__builtin_thread_pointer’ is not supported on this target # 00:00:14 make[2]: *** [/home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/sysd-rules:485: /home/tcwg-buildslave/workspace/tcwg_gnu_0/abe/builds/x86_64-pc-linux-gnu/aarch64-linux-gnu/glibc-glibc.git~master/csu/libc-tls.o] Error 1 # 00:00:14 ../sysdeps/unix/sysv/linux/aarch64/sysdep.h:190:17: error: invalid register name for ‘_x0’ # 00:00:14 ../sysdeps/unix/sysv/linux/aarch64/sysdep.h:174:22: error: invalid register name for ‘_x8’ from (for last_good == 91fb0f17a5779da6e7877eb74119a83dbe8bf167) # reset_artifacts: -10 # true: 0 # build_abe binutils: 1 # build_abe stage1: 2 # build_abe linux: 3 # build_abe glibc: 4 # build_abe stage2: 5 # build_abe qemu: 6 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… Build top page/logs: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… Configuration details: Reproduce builds: <cut> mkdir investigate-glibc-c8935581de4ff931bc32fb03da5d87f0ee2378a1 cd investigate-glibc-c8935581de4ff931bc32fb03da5d87f0ee2378a1 git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh cd glibc # Reproduce first_bad build git checkout --detach c8935581de4ff931bc32fb03da5d87f0ee2378a1 ../artifacts/test.sh # Reproduce last_good build git checkout --detach 91fb0f17a5779da6e7877eb74119a83dbe8bf167 ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… Build log: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-aarch64-build_cross/… Full commit (up to 1000 lines): <cut> commit c8935581de4ff931bc32fb03da5d87f0ee2378a1 Author: Khem Raj <raj.khem(a)gmail.com> Date: Fri Jul 2 13:28:10 2021 -0700 linux: Check for null value msghdr struct before use This avoids crashes in libc when cmsg is null and refrencing msg structure when it is null Signed-off-by: Khem Raj <raj.khem(a)gmail.com> Reviewed-by: Adhemerval Zanella <adhemerval.zanella(a)linaro.org> --- sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 2 ++ sysdeps/unix/sysv/linux/recvmsg.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c index d75a4618dd..5af71847f5 100644 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c @@ -87,6 +87,8 @@ __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) msg->msg_controllen += CMSG_SPACE (sizeof tvts); cmsg = CMSG_NXTHDR(msg, last); + if (cmsg == NULL) + return; cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = type; cmsg->cmsg_len = CMSG_LEN (sizeof tvts); diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c index a2a600228b..57c3cf7e36 100644 --- a/sysdeps/unix/sysv/linux/recvmsg.c +++ b/sysdeps/unix/sysv/linux/recvmsg.c @@ -25,7 +25,7 @@ __libc_recvmsg (int fd, struct msghdr *msg, int flags) { ssize_t r; #ifndef __ASSUME_TIME64_SYSCALLS - socklen_t orig_controllen = msg->msg_controllen; + socklen_t orig_controllen = msg != NULL ? msg->msg_controllen : 0; #endif #ifdef __ASSUME_RECVMSG_SYSCALL @@ -35,7 +35,7 @@ __libc_recvmsg (int fd, struct msghdr *msg, int flags) #endif #ifndef __ASSUME_TIME64_SYSCALLS - if (r >= 0) + if (r >= 0 && orig_controllen != 0) __convert_scm_timestamps (msg, orig_controllen); #endif </cut>

4 years, 3 months

[CI-NOTIFY]: TCWG Bisect tcwg_cross/gnu-master-arm-build_cross - Build # 60 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *gcc* in CI configuration tcwg_cross/gnu-master-arm-build_cross. So far, this commit has regressed CI configurations: - tcwg_cross/gnu-master-arm-build_cross Culprit: <cut> commit a110855667782dac7b674d3e328b253b3b3c919b Author: Martin Sebor <msebor(a)redhat.com> Date: Wed Jul 7 14:05:25 2021 -0600 Correct handling of variable offset minus constant in -Warray-bounds [PR100137] Resolves: PR tree-optimization/100137 - -Warray-bounds false positive on varying offset plus negative PR tree-optimization/99121 - ICE in -Warray-bounds on a multidimensional PR tree-optimization/97027 - missing warning on buffer overflow storing a larger scalar into a smaller array gcc/ChangeLog: PR tree-optimization/100137 PR tree-optimization/99121 PR tree-optimization/97027 * builtins.c (access_ref::access_ref): Also set offmax. (access_ref::offset_in_range): Define new function. (access_ref::add_offset): Set offmax. (access_ref::inform_access): Handle access_none. (handle_mem_ref): Clear ostype. (compute_objsize_r): Handle ASSERT_EXPR. * builtins.h (struct access_ref): Add offmax member. * gimple-array-bounds.cc (array_bounds_checker::check_mem_ref): Use compute_objsize() and simplify. gcc/testsuite/ChangeLog: PR tree-optimization/100137 PR tree-optimization/99121 PR tree-optimization/97027 * c-c++-common/Warray-bounds-3.c: Remove xfail * c-c++-common/Warray-bounds-4.c: Add an expected warning. * c-c++-common/Warray-bounds-9.c: New test. * c-c++-common/Warray-bounds-10.c: New test. * g++.dg/asan/asan_test.C: Suppress expected warnings. * g++.dg/pr95768.C: Same. * g++.dg/warn/Warray-bounds-10.C: Adjust text of expected messages. * g++.dg/warn/Warray-bounds-11.C: Same. * g++.dg/warn/Warray-bounds-12.C: Same. * g++.dg/warn/Warray-bounds-13.C: Same. * g++.dg/warn/Warray-bounds-17.C: Same. * g++.dg/warn/Warray-bounds-20.C: Same. * gcc.dg/Warray-bounds-29.c: Same. * gcc.dg/Warray-bounds-30.c: Add xfail. * gcc.dg/Warray-bounds-31.c: Adjust text of expected messages. * gcc.dg/Warray-bounds-32.c: Same. * gcc.dg/Warray-bounds-52.c: Same. * gcc.dg/Warray-bounds-53.c: Same. * gcc.dg/Warray-bounds-58.c: Remove xfail. * gcc.dg/Warray-bounds-63.c: Adjust text of expected messages. * gcc.dg/Warray-bounds-66.c: Same. * gcc.dg/Warray-bounds-69.c: Same. * gcc.dg/Wstringop-overflow-34.c: Same. * gcc.dg/Wstringop-overflow-47.c: Same. * gcc.dg/Wstringop-overflow-61.c: Same. * gcc.dg/Warray-bounds-77.c: New test. * gcc.dg/Warray-bounds-78.c: New test. * gcc.dg/Warray-bounds-79.c: New test. </cut> Results regressed to (for first_bad == a110855667782dac7b674d3e328b253b3b3c919b) # reset_artifacts: -10 # true: 0 # build_abe binutils: 1 # build_abe stage1: 2 # build_abe linux: 3 # build_abe glibc: 4 # First few build errors in logs: # 00:04:02 cc1: error: no include path in which to search for stdc-predef.h # 00:04:53 /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libatomic/config/linux/arm/host-config.h:42:34: error: array subscript 0 is outside array bounds of ‘unsigned int[0]’ [-Werror=array-bounds] # 00:04:53 /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libatomic/config/linux/arm/host-config.h:42:34: error: array subscript 0 is outside array bounds of ‘unsigned int[0]’ [-Werror=array-bounds] # 00:04:53 /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libatomic/config/linux/arm/host-config.h:42:34: error: array subscript 0 is outside array bounds of ‘unsigned int[0]’ [-Werror=array-bounds] # 00:04:53 make[4]: *** [Makefile:586: glfree.lo] Error 1 # 00:04:53 /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libatomic/config/linux/arm/host-config.h:42:34: error: array subscript 0 is outside array bounds of ‘unsigned int[0]’ [-Werror=array-bounds] # 00:04:53 make[4]: *** [Makefile:586: gstore.lo] Error 1 # 00:04:54 make[4]: *** [Makefile:586: gcas.lo] Error 1 # 00:04:54 make[4]: *** [Makefile:586: gexch.lo] Error 1 # 00:04:54 make[3]: *** [Makefile:608: all-recursive] Error 1 from (for last_good == 6278065af07634278ba30029d92a82b089969baa) # reset_artifacts: -10 # true: 0 # build_abe binutils: 1 # build_abe stage1: 2 # build_abe linux: 3 # build_abe glibc: 4 # build_abe stage2: 5 # build_abe qemu: 6 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/a… Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/a… Build top page/logs: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/ Configuration details: Reproduce builds: <cut> mkdir investigate-gcc-a110855667782dac7b674d3e328b253b3b3c919b cd investigate-gcc-a110855667782dac7b674d3e328b253b3b3c919b git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/a… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/a… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/a… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh cd gcc # Reproduce first_bad build git checkout --detach a110855667782dac7b674d3e328b253b3b3c919b ../artifacts/test.sh # Reproduce last_good build git checkout --detach 6278065af07634278ba30029d92a82b089969baa ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/a… Build log: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-master-arm-build_cross/60/c… Full commit (up to 1000 lines): <cut> commit a110855667782dac7b674d3e328b253b3b3c919b Author: Martin Sebor <msebor(a)redhat.com> Date: Wed Jul 7 14:05:25 2021 -0600 Correct handling of variable offset minus constant in -Warray-bounds [PR100137] Resolves: PR tree-optimization/100137 - -Warray-bounds false positive on varying offset plus negative PR tree-optimization/99121 - ICE in -Warray-bounds on a multidimensional PR tree-optimization/97027 - missing warning on buffer overflow storing a larger scalar into a smaller array gcc/ChangeLog: PR tree-optimization/100137 PR tree-optimization/99121 PR tree-optimization/97027 * builtins.c (access_ref::access_ref): Also set offmax. (access_ref::offset_in_range): Define new function. (access_ref::add_offset): Set offmax. (access_ref::inform_access): Handle access_none. (handle_mem_ref): Clear ostype. (compute_objsize_r): Handle ASSERT_EXPR. * builtins.h (struct access_ref): Add offmax member. * gimple-array-bounds.cc (array_bounds_checker::check_mem_ref): Use compute_objsize() and simplify. gcc/testsuite/ChangeLog: PR tree-optimization/100137 PR tree-optimization/99121 PR tree-optimization/97027 * c-c++-common/Warray-bounds-3.c: Remove xfail * c-c++-common/Warray-bounds-4.c: Add an expected warning. * c-c++-common/Warray-bounds-9.c: New test. * c-c++-common/Warray-bounds-10.c: New test. * g++.dg/asan/asan_test.C: Suppress expected warnings. * g++.dg/pr95768.C: Same. * g++.dg/warn/Warray-bounds-10.C: Adjust text of expected messages. * g++.dg/warn/Warray-bounds-11.C: Same. * g++.dg/warn/Warray-bounds-12.C: Same. * g++.dg/warn/Warray-bounds-13.C: Same. * g++.dg/warn/Warray-bounds-17.C: Same. * g++.dg/warn/Warray-bounds-20.C: Same. * gcc.dg/Warray-bounds-29.c: Same. * gcc.dg/Warray-bounds-30.c: Add xfail. * gcc.dg/Warray-bounds-31.c: Adjust text of expected messages. * gcc.dg/Warray-bounds-32.c: Same. * gcc.dg/Warray-bounds-52.c: Same. * gcc.dg/Warray-bounds-53.c: Same. * gcc.dg/Warray-bounds-58.c: Remove xfail. * gcc.dg/Warray-bounds-63.c: Adjust text of expected messages. * gcc.dg/Warray-bounds-66.c: Same. * gcc.dg/Warray-bounds-69.c: Same. * gcc.dg/Wstringop-overflow-34.c: Same. * gcc.dg/Wstringop-overflow-47.c: Same. * gcc.dg/Wstringop-overflow-61.c: Same. * gcc.dg/Warray-bounds-77.c: New test. * gcc.dg/Warray-bounds-78.c: New test. * gcc.dg/Warray-bounds-79.c: New test. --- gcc/builtins.c | 69 +++++- gcc/builtins.h | 5 + gcc/gimple-array-bounds.cc | 336 ++++---------------------- gcc/testsuite/c-c++-common/Warray-bounds-10.c | 114 +++++++++ gcc/testsuite/c-c++-common/Warray-bounds-3.c | 4 +- gcc/testsuite/c-c++-common/Warray-bounds-4.c | 12 +- gcc/testsuite/c-c++-common/Warray-bounds-9.c | 144 +++++++++++ gcc/testsuite/g++.dg/asan/asan_test.C | 2 +- gcc/testsuite/g++.dg/pr95768.C | 2 +- gcc/testsuite/g++.dg/warn/Warray-bounds-10.C | 4 +- gcc/testsuite/g++.dg/warn/Warray-bounds-11.C | 4 +- gcc/testsuite/g++.dg/warn/Warray-bounds-12.C | 4 +- gcc/testsuite/g++.dg/warn/Warray-bounds-13.C | 4 +- gcc/testsuite/g++.dg/warn/Warray-bounds-17.C | 2 +- gcc/testsuite/g++.dg/warn/Warray-bounds-20.C | 8 +- gcc/testsuite/gcc.dg/Warray-bounds-29.c | 22 +- gcc/testsuite/gcc.dg/Warray-bounds-30.c | 2 +- gcc/testsuite/gcc.dg/Warray-bounds-31.c | 8 +- gcc/testsuite/gcc.dg/Warray-bounds-32.c | 26 +- gcc/testsuite/gcc.dg/Warray-bounds-52.c | 6 +- gcc/testsuite/gcc.dg/Warray-bounds-53.c | 6 +- gcc/testsuite/gcc.dg/Warray-bounds-58.c | 2 +- gcc/testsuite/gcc.dg/Warray-bounds-63.c | 6 +- gcc/testsuite/gcc.dg/Warray-bounds-66.c | 12 +- gcc/testsuite/gcc.dg/Warray-bounds-69.c | 2 +- gcc/testsuite/gcc.dg/Warray-bounds-77.c | 135 +++++++++++ gcc/testsuite/gcc.dg/Warray-bounds-78.c | 109 +++++++++ gcc/testsuite/gcc.dg/Warray-bounds-79.c | 112 +++++++++ gcc/testsuite/gcc.dg/Wstringop-overflow-34.c | 8 +- gcc/testsuite/gcc.dg/Wstringop-overflow-47.c | 14 +- gcc/testsuite/gcc.dg/Wstringop-overflow-61.c | 4 +- 31 files changed, 817 insertions(+), 371 deletions(-) diff --git a/gcc/builtins.c b/gcc/builtins.c index e52fe4291c8..39ab139b7e1 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -206,6 +206,7 @@ access_ref::access_ref (tree bound /* = NULL_TREE */, { /* Set to valid. */ offrng[0] = offrng[1] = 0; + offmax[0] = offmax[1] = 0; /* Invalidate. */ sizrng[0] = sizrng[1] = -1; @@ -457,6 +458,21 @@ access_ref::size_remaining (offset_int *pmin /* = NULL */) const return sizrng[1] - or0; } +/* Return true if the offset and object size are in range for SIZE. */ + +bool +access_ref::offset_in_range (const offset_int &size) const +{ + if (size_remaining () < size) + return false; + + if (base0) + return offmax[0] >= 0 && offmax[1] <= sizrng[1]; + + offset_int maxoff = wi::to_offset (TYPE_MAX_VALUE (ptrdiff_type_node)); + return offmax[0] > -maxoff && offmax[1] < maxoff; +} + /* Add the range [MIN, MAX] to the offset range. For known objects (with zero-based offsets) at least one of whose offset's bounds is in range, constrain the other (or both) to the bounds of the object (i.e., zero @@ -493,6 +509,8 @@ void access_ref::add_offset (const offset_int &min, const offset_int &max) if (max >= 0) { offrng[0] = 0; + if (offmax[0] > 0) + offmax[0] = 0; return; } @@ -509,6 +527,12 @@ void access_ref::add_offset (const offset_int &min, const offset_int &max) offrng[0] = 0; } + /* Set the minimum and maximmum computed so far. */ + if (offrng[1] < 0 && offrng[1] < offmax[0]) + offmax[0] = offrng[1]; + if (offrng[0] > 0 && offrng[0] > offmax[1]) + offmax[1] = offrng[0]; + if (!base0) return; @@ -4571,23 +4595,46 @@ access_ref::inform_access (access_mode mode) const return; } + if (mode == access_read_only) + { + if (allocfn == NULL_TREE) + { + if (*offstr) + inform (loc, "at offset %s into source object %qE of size %s", + offstr, ref, sizestr); + else + inform (loc, "source object %qE of size %s", ref, sizestr); + + return; + } + + if (*offstr) + inform (loc, + "at offset %s into source object of size %s allocated by %qE", + offstr, sizestr, allocfn); + else + inform (loc, "source object of size %s allocated by %qE", + sizestr, allocfn); + return; + } + if (allocfn == NULL_TREE) { if (*offstr) - inform (loc, "at offset %s into source object %qE of size %s", + inform (loc, "at offset %s into object %qE of size %s", offstr, ref, sizestr); else - inform (loc, "source object %qE of size %s", ref, sizestr); + inform (loc, "object %qE of size %s", ref, sizestr); return; } if (*offstr) inform (loc, - "at offset %s into source object of size %s allocated by %qE", + "at offset %s into object of size %s allocated by %qE", offstr, sizestr, allocfn); else - inform (loc, "source object of size %s allocated by %qE", + inform (loc, "object of size %s allocated by %qE", sizestr, allocfn); } @@ -5433,16 +5480,16 @@ handle_mem_ref (tree mref, int ostype, access_ref *pref, if (VECTOR_TYPE_P (TREE_TYPE (mref))) { - /* Hack: Give up for MEM_REFs of vector types; those may be - synthesized from multiple assignments to consecutive data - members (see PR 93200 and 96963). + /* Hack: Handle MEM_REFs of vector types as those to complete + objects; those may be synthesized from multiple assignments + to consecutive data members (see PR 93200 and 96963). FIXME: Vectorized assignments should only be present after vectorization so this hack is only necessary after it has run and could be avoided in calls from prior passes (e.g., tree-ssa-strlen.c). FIXME: Deal with this more generally, e.g., by marking up such MEM_REFs at the time they're created. */ - return false; + ostype = 0; } tree mrefop = TREE_OPERAND (mref, 0); @@ -5796,6 +5843,12 @@ compute_objsize_r (tree ptr, int ostype, access_ref *pref, tree rhs = gimple_assign_rhs1 (stmt); + if (code == ASSERT_EXPR) + { + rhs = TREE_OPERAND (rhs, 0); + return compute_objsize_r (rhs, ostype, pref, snlim, qry); + } + if (code == POINTER_PLUS_EXPR && TREE_CODE (TREE_TYPE (rhs)) == POINTER_TYPE) { diff --git a/gcc/builtins.h b/gcc/builtins.h index e71f40c300a..a64ece3f1cd 100644 --- a/gcc/builtins.h +++ b/gcc/builtins.h @@ -222,6 +222,9 @@ struct access_ref argument to the minimum. */ offset_int size_remaining (offset_int * = NULL) const; +/* Return true if the offset and object size are in range for SIZE. */ + bool offset_in_range (const offset_int &) const; + /* Return true if *THIS is an access to a declared object. */ bool ref_declared () const { @@ -261,6 +264,8 @@ struct access_ref /* Range of byte offsets into and sizes of the object(s). */ offset_int offrng[2]; offset_int sizrng[2]; + /* The minimum and maximum offset computed. */ + offset_int offmax[2]; /* Range of the bound of the access: denotes that the access is at least BNDRNG[0] bytes but no more than BNDRNG[1]. For string functions the size of the actual access is diff --git a/gcc/gimple-array-bounds.cc b/gcc/gimple-array-bounds.cc index 13f08685f8f..83b8db9755e 100644 --- a/gcc/gimple-array-bounds.cc +++ b/gcc/gimple-array-bounds.cc @@ -414,269 +414,72 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, if (warning_suppressed_p (ref, OPT_Warray_bounds)) return false; - tree arg = TREE_OPERAND (ref, 0); - /* The constant and variable offset of the reference. */ - tree cstoff = TREE_OPERAND (ref, 1); - tree varoff = NULL_TREE; - - const offset_int maxobjsize = tree_to_shwi (max_object_size ()); - - /* The zero-based array or string constant bounds in bytes. Initially - set to [-MAXOBJSIZE - 1, MAXOBJSIZE] until a tighter bound is - determined. */ - offset_int arrbounds[2] = { -maxobjsize - 1, maxobjsize }; - - /* The minimum and maximum intermediate offset. For a reference - to be valid, not only does the final offset/subscript must be - in bounds but all intermediate offsets should be as well. - GCC may be able to deal gracefully with such out-of-bounds - offsets so the checking is only enabled at -Warray-bounds=2 - where it may help detect bugs in uses of the intermediate - offsets that could otherwise not be detectable. */ - offset_int ioff = wi::to_offset (fold_convert (ptrdiff_type_node, cstoff)); - offset_int extrema[2] = { 0, wi::abs (ioff) }; - - /* The range of the byte offset into the reference. */ - offset_int offrange[2] = { 0, 0 }; - /* The statement used to allocate the array or null. */ gimple *alloc_stmt = NULL; /* For an allocation statement, the low bound of the size range. */ offset_int minbound = 0; + /* The type and size of the access. */ + tree axstype = TREE_TYPE (ref); + offset_int axssize = 0; + if (TREE_CODE (axstype) != UNION_TYPE) + if (tree access_size = TYPE_SIZE_UNIT (axstype)) + if (TREE_CODE (access_size) == INTEGER_CST) + axssize = wi::to_offset (access_size); - /* Determine the offsets and increment OFFRANGE for the bounds of each. - The loop computes the range of the final offset for expressions such - as (A + i0 + ... + iN)[CSTOFF] where i0 through iN are SSA_NAMEs in - some range. */ - const unsigned limit = param_ssa_name_def_chain_limit; - for (unsigned n = 0; TREE_CODE (arg) == SSA_NAME && n < limit; ++n) - { - gimple *def = SSA_NAME_DEF_STMT (arg); - if (is_gimple_call (def)) - { - /* Determine the byte size of the array from an allocation call. */ - wide_int sizrng[2]; - if (gimple_call_alloc_size (def, sizrng)) - { - arrbounds[0] = 0; - arrbounds[1] = offset_int::from (sizrng[1], UNSIGNED); - minbound = offset_int::from (sizrng[0], UNSIGNED); - alloc_stmt = def; - } - break; - } - - if (gimple_nop_p (def)) - { - /* For a function argument try to determine the byte size - of the array from the current function declaratation - (e.g., attribute access or related). */ - wide_int wr[2]; - tree ref = gimple_parm_array_size (arg, wr); - if (!ref) - break; - arrbounds[0] = offset_int::from (wr[0], UNSIGNED); - arrbounds[1] = offset_int::from (wr[1], UNSIGNED); - arg = ref; - break; - } - - if (!is_gimple_assign (def)) - break; - - tree_code code = gimple_assign_rhs_code (def); - if (code == POINTER_PLUS_EXPR) - { - arg = gimple_assign_rhs1 (def); - varoff = gimple_assign_rhs2 (def); - } - else if (code == ASSERT_EXPR) - { - arg = TREE_OPERAND (gimple_assign_rhs1 (def), 0); - continue; - } - else - return false; - - /* VAROFF should always be a SSA_NAME here (and not even - INTEGER_CST) but there's no point in taking chances. */ - if (TREE_CODE (varoff) != SSA_NAME) - break; - - const value_range* const vr = get_value_range (varoff); - if (!vr || vr->undefined_p () || vr->varying_p ()) - break; - - if (!vr->constant_p ()) - break; - - if (vr->kind () == VR_RANGE) - { - offset_int min - = wi::to_offset (fold_convert (ptrdiff_type_node, vr->min ())); - offset_int max - = wi::to_offset (fold_convert (ptrdiff_type_node, vr->max ())); - if (min < max) - { - offrange[0] += min; - offrange[1] += max; - } - else - { - /* When MIN >= MAX, the offset is effectively in a union - of two ranges: [-MAXOBJSIZE -1, MAX] and [MIN, MAXOBJSIZE]. - Since there is no way to represent such a range across - additions, conservatively add [-MAXOBJSIZE -1, MAXOBJSIZE] - to OFFRANGE. */ - offrange[0] += arrbounds[0]; - offrange[1] += arrbounds[1]; - } - } - else - { - /* For an anti-range, analogously to the above, conservatively - add [-MAXOBJSIZE -1, MAXOBJSIZE] to OFFRANGE. */ - offrange[0] += arrbounds[0]; - offrange[1] += arrbounds[1]; - } - - /* Keep track of the minimum and maximum offset. */ - if (offrange[1] < 0 && offrange[1] < extrema[0]) - extrema[0] = offrange[1]; - if (offrange[0] > 0 && offrange[0] > extrema[1]) - extrema[1] = offrange[0]; - - if (offrange[0] < arrbounds[0]) - offrange[0] = arrbounds[0]; - - if (offrange[1] > arrbounds[1]) - offrange[1] = arrbounds[1]; - } + access_ref aref; + if (!compute_objsize (ref, 1, &aref, ranges)) + return false; - tree reftype = NULL_TREE; - offset_int eltsize = -1; - if (arrbounds[0] >= 0) - { - /* The byte size of the array has already been determined above - based on a pointer ARG. Set ELTSIZE to the size of the type - it points to and REFTYPE to the array with the size, rounded - down as necessary. */ - reftype = TREE_TYPE (TREE_TYPE (arg)); - if (TREE_CODE (reftype) == ARRAY_TYPE) - reftype = TREE_TYPE (reftype); - if (tree refsize = TYPE_SIZE_UNIT (reftype)) - if (TREE_CODE (refsize) == INTEGER_CST) - eltsize = wi::to_offset (refsize); - - if (eltsize < 0) - return false; + if (aref.offset_in_range (axssize)) + return false; - offset_int nelts = arrbounds[1] / eltsize; - reftype = build_printable_array_type (reftype, nelts.to_uhwi ()); - } - else if (TREE_CODE (arg) == ADDR_EXPR) + if (TREE_CODE (aref.ref) == SSA_NAME) { - arg = TREE_OPERAND (arg, 0); - if (TREE_CODE (arg) != STRING_CST - && TREE_CODE (arg) != PARM_DECL - && TREE_CODE (arg) != VAR_DECL) - return false; - - /* The type of the object being referred to. It can be an array, - string literal, or a non-array type when the MEM_REF represents - a reference/subscript via a pointer to an object that is not - an element of an array. Incomplete types are excluded as well - because their size is not known. */ - reftype = TREE_TYPE (arg); - if (POINTER_TYPE_P (reftype) - || !COMPLETE_TYPE_P (reftype) - || TREE_CODE (TYPE_SIZE_UNIT (reftype)) != INTEGER_CST) - return false; - - /* Except in declared objects, references to trailing array members - of structs and union objects are excluded because MEM_REF doesn't - make it possible to identify the member where the reference - originated. */ - if (RECORD_OR_UNION_TYPE_P (reftype) - && (!VAR_P (arg) - || (DECL_EXTERNAL (arg) && array_at_struct_end_p (ref)))) - return false; - - /* FIXME: Should this be 1 for Fortran? */ - arrbounds[0] = 0; - - if (TREE_CODE (reftype) == ARRAY_TYPE) - { - /* Set to the size of the array element (and adjust below). */ - eltsize = wi::to_offset (TYPE_SIZE_UNIT (TREE_TYPE (reftype))); - /* Use log2 of size to convert the array byte size in to its - upper bound in elements. */ - const offset_int eltsizelog2 = wi::floor_log2 (eltsize); - if (tree dom = TYPE_DOMAIN (reftype)) - { - tree bnds[] = { TYPE_MIN_VALUE (dom), TYPE_MAX_VALUE (dom) }; - if (TREE_CODE (arg) == COMPONENT_REF) - { - offset_int size = maxobjsize; - if (tree fldsize = component_ref_size (arg)) - size = wi::to_offset (fldsize); - arrbounds[1] = wi::lrshift (size, eltsizelog2); - } - else if (array_at_struct_end_p (arg) || !bnds[0] || !bnds[1]) - arrbounds[1] = wi::lrshift (maxobjsize, eltsizelog2); - else - arrbounds[1] = (wi::to_offset (bnds[1]) - wi::to_offset (bnds[0]) - + 1) * eltsize; - } - else - arrbounds[1] = wi::lrshift (maxobjsize, eltsizelog2); - - /* Determine a tighter bound of the non-array element type. */ - tree eltype = TREE_TYPE (reftype); - while (TREE_CODE (eltype) == ARRAY_TYPE) - eltype = TREE_TYPE (eltype); - eltsize = wi::to_offset (TYPE_SIZE_UNIT (eltype)); - } - else + gimple *def = SSA_NAME_DEF_STMT (aref.ref); + if (is_gimple_call (def)) { - eltsize = 1; - tree size = TYPE_SIZE_UNIT (reftype); - if (VAR_P (arg)) - if (tree initsize = DECL_SIZE_UNIT (arg)) - if (tree_int_cst_lt (size, initsize)) - size = initsize; - - arrbounds[1] = wi::to_offset (size); + /* Save the allocation call and the low bound on the size. */ + alloc_stmt = def; + minbound = aref.sizrng[0]; } } - else - return false; - - offrange[0] += ioff; - offrange[1] += ioff; + + /* The range of the byte offset into the reference. Adjusted below. */ + offset_int offrange[2] = { aref.offrng[0], aref.offrng[1] }; + + /* The type of the referenced object. */ + tree reftype = TREE_TYPE (aref.ref); + /* The size of the referenced array element. */ + offset_int eltsize = 1; + /* The byte size of the array has already been determined above + based on a pointer ARG. Set ELTSIZE to the size of the type + it points to and REFTYPE to the array with the size, rounded + down as necessary. */ + if (POINTER_TYPE_P (reftype)) + reftype = TREE_TYPE (reftype); + if (TREE_CODE (reftype) == ARRAY_TYPE) + reftype = TREE_TYPE (reftype); + if (tree refsize = TYPE_SIZE_UNIT (reftype)) + if (TREE_CODE (refsize) == INTEGER_CST) + eltsize = wi::to_offset (refsize); + + const offset_int nelts = aref.sizrng[1] / eltsize; + reftype = build_printable_array_type (reftype, nelts.to_uhwi ()); /* Compute the more permissive upper bound when IGNORE_OFF_BY_ONE is set (when taking the address of the one-past-last element of an array) but always use the stricter bound in diagnostics. */ - offset_int ubound = arrbounds[1]; + offset_int ubound = aref.sizrng[1]; if (ignore_off_by_one) ubound += eltsize; - bool warned = false; /* Set if the lower bound of the subscript is out of bounds. */ - const bool lboob = (arrbounds[0] == arrbounds[1] + const bool lboob = (aref.sizrng[1] == 0 || offrange[0] >= ubound - || offrange[1] < arrbounds[0]); + || offrange[1] < 0); /* Set if only the upper bound of the subscript is out of bounds. This can happen when using a bigger type to index into an array of a smaller type, as is common with unsigned char. */ - tree axstype = TREE_TYPE (ref); - offset_int axssize = 0; - if (TREE_CODE (axstype) != UNION_TYPE) - if (tree access_size = TYPE_SIZE_UNIT (axstype)) - if (TREE_CODE (access_size) == INTEGER_CST) - axssize = wi::to_offset (access_size); - const bool uboob = !lboob && offrange[0] + axssize > ubound; if (lboob || uboob) { @@ -689,9 +492,7 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, to compute the index to print in the diagnostic; arrays in MEM_REF don't mean anything. A type with no size like void is as good as having a size of 1. */ - tree type = TREE_TYPE (ref); - while (TREE_CODE (type) == ARRAY_TYPE) - type = TREE_TYPE (type); + tree type = strip_array_types (TREE_TYPE (ref)); if (tree size = TYPE_SIZE_UNIT (type)) { offrange[0] = offrange[0] / wi::to_offset (size); @@ -699,6 +500,7 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, } } + bool warned = false; if (lboob) { if (offrange[0] == offrange[1]) @@ -720,7 +522,7 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, /* If the memory was dynamically allocated refer to it as if it were an untyped array of bytes. */ backtype = build_array_type_nelts (unsigned_char_type_node, - arrbounds[1].to_uhwi ()); + aref.sizrng[1].to_uhwi ()); warned = warning_at (location, OPT_Warray_bounds, "array subscript %<%T[%wi]%> is partly " @@ -730,46 +532,8 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, if (warned) { - if (DECL_P (arg)) - inform (DECL_SOURCE_LOCATION (arg), "while referencing %qD", arg); - else if (alloc_stmt) - { - location_t loc = gimple_location (alloc_stmt); - if (gimple_call_builtin_p (alloc_stmt, BUILT_IN_ALLOCA_WITH_ALIGN)) - { - if (minbound == arrbounds[1]) - inform (loc, "referencing a variable length array " - "of size %wu", minbound.to_uhwi ()); - else - inform (loc, "referencing a variable length array " - "of size between %wu and %wu", - minbound.to_uhwi (), arrbounds[1].to_uhwi ()); - } - else if (tree fndecl = gimple_call_fndecl (alloc_stmt)) - { - if (minbound == arrbounds[1]) - inform (loc, "referencing an object of size %wu " - "allocated by %qD", - minbound.to_uhwi (), fndecl); - else - inform (loc, "referencing an object of size between " - "%wu and %wu allocated by %qD", - minbound.to_uhwi (), arrbounds[1].to_uhwi (), fndecl); - } - else - { - tree fntype = gimple_call_fntype (alloc_stmt); - if (minbound == arrbounds[1]) - inform (loc, "referencing an object of size %wu " - "allocated by %qT", - minbound.to_uhwi (), fntype); - else - inform (loc, "referencing an object of size between " - "%wu and %wu allocated by %qT", - minbound.to_uhwi (), arrbounds[1].to_uhwi (), fntype); - } - } - + /* TODO: Determine the access from the statement and use it. */ + aref.inform_access (access_none); suppress_warning (ref, OPT_Warray_bounds); return true; } @@ -779,9 +543,9 @@ array_bounds_checker::check_mem_ref (location_t location, tree ref, /* At level 2 check also intermediate offsets. */ int i = 0; - if (extrema[i] < -arrbounds[1] || extrema[i = 1] > ubound) + if (aref.offmax[i] < -aref.sizrng[1] || aref.offmax[i = 1] > ubound) { - HOST_WIDE_INT tmpidx = extrema[i].to_shwi () / eltsize.to_shwi (); + HOST_WIDE_INT tmpidx = aref.offmax[i].to_shwi () / eltsize.to_shwi (); if (warning_at (location, OPT_Warray_bounds, "intermediate array offset %wi is outside array bounds " diff --git a/gcc/testsuite/c-c++-common/Warray-bounds-10.c b/gcc/testsuite/c-c++-common/Warray-bounds-10.c new file mode 100644 index 00000000000..cfe9a383410 --- /dev/null +++ b/gcc/testsuite/c-c++-common/Warray-bounds-10.c @@ -0,0 +1,114 @@ +/* PR tree-optimization/99475 - bogus -Warray-bounds accessing an array + element of empty structs + { dg-do compile } + { dg-options "-O2 -Wall" } */ + +struct S +{ +#if SOME_CONFIG_MACRO + /* Suppose the contents are empty in the development configuration + but non-empty in others. Out of bounds accesses to elements of + the arrays below should be diagnosed in all configurations, + including when S is empty, even if they are folded away. */ + int member; +#endif +}; + +extern struct S sa3[3]; +extern struct S sa2_3[2][3]; +extern struct S sa3_4_5[3][4][5]; + +void sink (void*); + + +void access_sa3 (struct S s) +{ + sa3[0] = s; + sa3[1] = s; + sa3[2] = s; + sa3[3] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } +} + +void access_sa3_ptr (struct S s) +{ + struct S *p = &sa3[0]; + + p[0] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[1] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[2] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[3] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } +} + +void access_sa2_3_ptr (struct S s) +{ + struct S *p = &sa2_3[0][0]; + + p[0] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[1] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[2] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[6] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } +} + +void access_sa3_4_5_ptr (struct S s, int i) +{ + struct S *p = &sa3_4_5[0][0][0]; + + p[0] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[1] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[2] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[60] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } +} + + +void access_vla3 (struct S s, unsigned n) +{ + struct S vla3[3 < n ? 3 : n]; + + vla3[0] = s; + vla3[1] = s; + vla3[2] = s; + vla3[3] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } + + sink (vla3); +} + +void access_vla3_ptr (struct S s, unsigned n) +{ + struct S vla3[3 < n ? 3 : n]; + struct S *p = &vla3[0]; + + p[0] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[1] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[2] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[3] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } + + sink (vla3); +} + +void access_vla2_3_ptr (struct S s, unsigned n) +{ + struct S vla2_3[2 < n ? 2 : n][3 < n ? 3 : n]; + struct S *p = &vla2_3[0][0]; + + p[0] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[1] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[2] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[6] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } + + sink (vla2_3); +} + +void access_vla3_4_5_ptr (struct S s, unsigned n) +{ + struct S vla3_4_5[3 < n ? 3 : n][4 < n ? 4 : n][5 < n ? 5 : n]; + struct S *p = &vla3_4_5[0][0][0]; + + p[0] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[1] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[2] = s; // { dg-bogus "\\\[-Warray-bounds" } + p[60] = s; // { dg-warning "\\\[-Warray-bounds" "pr?????" { xfail *-*-* } } + + sink (vla3_4_5); +} + +// { dg-prune-output "empty struct has size 0 in C" } diff --git a/gcc/testsuite/c-c++-common/Warray-bounds-3.c b/gcc/testsuite/c-c++-common/Warray-bounds-3.c index aae4999ea13..3d7c7687374 100644 --- a/gcc/testsuite/c-c++-common/Warray-bounds-3.c +++ b/gcc/testsuite/c-c++-common/Warray-bounds-3.c @@ -158,7 +158,7 @@ void test_memcpy_overflow (char *d, const char *s, size_t n) but known access size is detected. This works except with small sizes that are powers of 2 due to bug . */ T (char, 1, arr + SR (DIFF_MAX - 1, DIFF_MAX), s, 1); - T (char, 1, arr + SR (DIFF_MAX - 1, DIFF_MAX), s, 2); /* { dg-warning "pointer overflow between offset \\\[\[0-9\]+, \[0-9\]+] and size 2 accessing array " "bug " { xfail non_strict_align } } */ + T (char, 1, arr + SR (DIFF_MAX - 1, DIFF_MAX), s, 2); /* { dg-warning "\\\[-Warray-bounds" } */ T (char, 1, arr + SR (DIFF_MAX - 2, DIFF_MAX), s, 3); /* { dg-warning "pointer overflow between offset \\\[\[0-9\]+, \[0-9\]+] and size 3 accessing array " "memcpy" } */ T (char, 1, arr + SR (DIFF_MAX - 4, DIFF_MAX), s, 5); /* { dg-warning "pointer overflow between offset \\\[\[0-9\]+, \[0-9\]+] and size 5 accessing array " "memcpy" } */ } @@ -178,7 +178,7 @@ void test_memcpy_bounds_memarray_range (void) TM (ma.a5, ma.a5 + i, ma.a5, 1); TM (ma.a5, ma.a5 + i, ma.a5, 3); - TM (ma.a5, ma.a5 + i, ma.a5, 5); + TM (ma.a5, ma.a5 + i, ma.a5, 5); /* { dg-warning "\\\[-Warray-bounds" } */ TM (ma.a5, ma.a5 + i, ma.a5, 7); /* diagnosed with -Warray-bounds=2 */ } diff --git a/gcc/testsuite/c-c++-common/Warray-bounds-4.c b/gcc/testsuite/c-c++-common/Warray-bounds-4.c index 22a23a12651..1f73f11943f 100644 --- a/gcc/testsuite/c-c++-common/Warray-bounds-4.c +++ b/gcc/testsuite/c-c++-common/Warray-bounds-4.c @@ -43,7 +43,17 @@ void test_memcpy_bounds_memarray_range (void) TM (ma.a5, ma.a5 + j, ma.a5, 1); TM (ma.a5, ma.a5 + j, ma.a5, 3); - TM (ma.a5, ma.a5 + j, ma.a5, 5); + + /* The copy below is invalid for two reasons: 1) it overlaps and 2) it + writes past the end of ma.a5. The warning is a little cryptic here + because the GIMPLE is: + _4 = &ma.a5 + prephitmp_14; + MEM <unsigned char[5]> [(char * {ref-all})_4] + = MEM <unsigned char[5]> [(char * {ref-all})&ma]; + and could be improved. Just verify that one is issued but not its + full text. */ + TM (ma.a5, ma.a5 + j, ma.a5, 5); /* { dg-warning "\\\[-Warray-bounds" } */ + TM (ma.a5, ma.a5 + j, ma.a5, 7); /* { dg-warning "offset \\\[5, 7] from the object at .ma. is out of the bounds of referenced subobject .$MA::$?a5. with type .char ?\\\[5]. at offset 0" } */ TM (ma.a5, ma.a5 + j, ma.a5, 9); /* { dg-warning "offset \\\[5, 9] from the object at .ma. is out of the bounds of referenced subobject .$MA::$?a5. with type .char ?\\\[5]. at offset 0" } */ } diff --git a/gcc/testsuite/c-c++-common/Warray-bounds-9.c b/gcc/testsuite/c-c++-common/Warray-bounds-9.c new file mode 100644 index 00000000000..be05775fa91 --- /dev/null +++ b/gcc/testsuite/c-c++-common/Warray-bounds-9.c @@ -0,0 +1,144 @@ +/* PR tree-optimization/99121 - ICE in -Warray-bounds on a multidimensional + VLA + { dg-do compile } + { dg-options "-O2 -Wall -ftrack-macro-expansion=0" } */ + +#define NOIPA __attribute__ ((noipa)) + +void sink (void*, ...); +#define T(a, x) sink (a, x) + + +NOIPA void a_0_n (int n) +{ + int a[0][n]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_n_0 (int n) +{ + int a[n][0]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + + +NOIPA void a_1_n_0 (int n) +{ + int a[1][n][0]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_1_0_n (int n) +{ + int a[1][0][n]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_0_1_n (int n) +{ + int a[0][1][n]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_0_n_1 (int n) +{ + int a[0][n][1]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_n_0_n (int n) +{ + int a[n][0][n]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_n_n_0 (int n) +{ + int a[n][n][0]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_0_n_n (int n) +{ + int a[0][n][n]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_0_0_n (int n) +{ + int a[0][0][n]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_n_0_0 (int n) +{ + int a[n][0][0]; + + sink (a); + + T (a, ((int *) a)[0]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((char *) a)[1]); // { dg-warning "\\\[-Warray-bounds" } + T (a, ((float *) a)[n]); // { dg-warning "\\\[-Warray-bounds" } +} + +NOIPA void a_n_n_n (int n) +{ + int a[n][n][n]; + + sink (a); + + T (a, ((int *) a)[-1]); // { dg-warning "\\\[-Warray-bounds" "pr99140" } + T (a, ((int *) a)[0]); + T (a, ((char *) a)[1]); + T (a, ((float *) a)[n]); +} diff --git a/gcc/testsuite/g++.dg/asan/asan_test.C b/gcc/testsuite/g++.dg/asan/asan_test.C index c62568f48ec..49933ab8e4d 100644 --- a/gcc/testsuite/g++.dg/asan/asan_test.C +++ b/gcc/testsuite/g++.dg/asan/asan_test.C @@ -2,7 +2,7 @@ // { dg-skip-if "" { *-*-* } { "*" } { "-O2" } } // { dg-skip-if "" { *-*-* } { "-flto" } { "" } } // { dg-additional-sources "asan_globals_test-wrapper.cc" } -// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Werror -Wno-alloc-size-larger-than -Wno-stringop-overflow -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread" } +// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Werror -Wno-alloc-size-larger-than -Wno-array-bounds -Wno-stringop-overflow -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread" } // { dg-additional-options "-ldl" { target { ! *-*-freebsd* } } } // { dg-additional-options "-DASAN_NEEDS_SEGV=1" { target { ! arm*-*-* } } } // { dg-additional-options "-DASAN_LOW_MEMORY=1 -DASAN_NEEDS_SEGV=0" { target arm*-*-* } } diff --git a/gcc/testsuite/g++.dg/pr95768.C b/gcc/testsuite/g++.dg/pr95768.C index 5e2c8c44ad0..d34d5133134 100644 --- a/gcc/testsuite/g++.dg/pr95768.C +++ b/gcc/testsuite/g++.dg/pr95768.C @@ -1,6 +1,6 @@ /* PR c++/95768 - pretty-printer ICE on -Wuninitialized with allocated storage { dg-do compile } - { dg-options "-O2 -Wall" } */ + { dg-options "-O2 -Wall -Wno-array-bounds" } */ </cut>

4 years, 3 months

[CI-NOTIFY]: TCWG Bisect tcwg_cross/gnu-release-aarch64-check_cross - Build # 28 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *gcc* in CI configuration tcwg_cross/gnu-release-aarch64-check_cross. So far, this commit has regressed CI configurations: - tcwg_cross/gnu-release-aarch64-check_cross Culprit: <cut> commit ca094af16ce810b1e553e000354b5d64a9b90a1a Author: Eric Botcazou <ebotcazou(a)adacore.com> Date: Fri Jul 9 18:30:54 2021 +0200 Missing piece in earlier change gcc/ada/ * gcc-interface/utils.c (finish_subprog_decl): Remove obsolete line. </cut> Results regressed to (for first_bad == ca094af16ce810b1e553e000354b5d64a9b90a1a) # reset_artifacts: -10 # build_abe binutils: -8 # build_abe stage1: -7 # build_abe linux: -6 # build_abe glibc: -5 # build_abe stage2: -4 # build_abe qemu: -3 # build_abe dejagnu: 0 # build_abe check_gcc -- --set runtestflags=g++.dg/asan/asan.exp --set runtestflags=gcc.c-torture/execute/execute.exp --set runtestflags=gcc.dg/asan/asan.exp --set runtestflags=gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp --set runtestflags=gcc.target/aarch64/sve/aarch64-sve.exp --set runtestflags=gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp --set runtestflags=gfortran.dg/dg.exp --set runtestflags=gfortran.dg/ieee/ieee.exp --set runtestflags=g++.dg/analyzer/analyzer.exp --set runtestflags=g++.dg/compat/compat.exp --set runtestflags=g++.dg/compat/struct-layout-1.exp --set runtestflags=g++.dg/coroutines/coroutines.exp --set runtestflags=g++.dg/coroutines/torture/coro-torture.exp --set runtestflags=g++.dg/debug/debug.exp --set runtestflags=g++.dg/debug/dwarf2/dwarf2.exp --set runtestflags=g++.dg/dg.exp --set runtestflags=g++.dg/goacc/goacc.exp --set runtestflags=g++.dg/gomp/gomp.exp --set runtestflags=g++.dg/lto/lto.exp --set runtestflags=g++.dg/pch/pch.exp --set runtestflags=g++.dg/special/ecos.exp --set runtestflags=g++.dg/tls/tls.exp --set runtestflags=g++.dg/tm/tm.exp --set runtestflags=g++.dg/torture/dg-torture.exp --set runtestflags=g++.dg/torture/stackalign/stackalign.exp --set runtestflags=g++.dg/vect/vect.exp --set runtestflags=g++.old-deja/old-deja.exp --set runtestflags=g++.target/aarch64/aarch64.exp --set runtestflags=g++.target/aarch64/sve/aarch64-sve.exp --set runtestflags=g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp --set runtestflags=g++.target/aarch64/sve/acle/aarch64-sve-acle.exp --set runtestflags=g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp --set runtestflags=gcc.c-torture/compile/compile.exp --set runtestflags=gcc.c-torture/execute/builtins/builtins.exp --set runtestflags=gcc.c-torture/execute/execute.exp --set runtestflags=gcc.c-torture/execute/ieee/ieee.exp --set runtestflags=gcc.c-torture/unsorted/unsorted.exp --set runtestflags=gcc.dg/analyzer/analyzer.exp --set runtestflags=gcc.dg/analyzer/torture/analyzer-torture.exp --set runtestflags=gcc.dg/compat/compat.exp --set runtestflags=gcc.dg/compat/struct-layout-1.exp --set runtestflags=gcc.dg/cpp/cpp.exp --set runtestflags=gcc.dg/cpp/trad/trad.exp --set runtestflags=gcc.dg/debug/debug.exp --set runtestflags=gcc.dg/dg.exp --set runtestflags=gcc.dg/goacc/goacc.exp --set runtestflags=gcc.dg/gomp/gomp.exp --set runtestflags=gcc.dg/ipa/ipa.exp --set runtestflags=gcc.dg/lto/lto.exp --set runtestflags=gcc.dg/pch/pch.exp --set runtestflags=gcc.dg/plugin/plugin.exp --set runtestflags=gcc.dg/special/special.exp --set runtestflags=gcc.dg/sso/sso.exp --set runtestflags=gcc.dg/tm/tm.exp --set runtestflags=gcc.dg/torture/dg-torture.exp --set runtestflags=gcc.dg/torture/stackalign/stackalign.exp --set runtestflags=gcc.dg/tree-ssa/tree-ssa.exp --set runtestflags=gcc.dg/vect/vect.exp --set runtestflags=gcc.dg/weak/weak.exp --set runtestflags=gcc.target/aarch64/aapcs64/aapcs64.exp --set runtestflags=gcc.target/aarch64/aarch64.exp --set runtestflags=gcc.target/aarch64/acle/acle.exp --set runtestflags=gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp --set runtestflags=gcc.target/aarch64/fp16/fp16.exp --set runtestflags=gcc.target/aarch64/simd/simd.exp --set runtestflags=gcc.target/aarch64/sve/aarch64-sve.exp --set runtestflags=gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp --set runtestflags=gcc.target/aarch64/sve/acle/aarch64-sve-acle.exp --set runtestflags=gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp --set runtestflags=gcc.target/aarch64/sve2/aarch64-sve2.exp --set runtestflags=gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp --set runtestflags=gcc.target/aarch64/sve2/acle/aarch64-sve2-acle.exp --set runtestflags=gcc.target/aarch64/torture/aarch64-torture.exp --set runtestflags=gfortran.dg/coarray/caf.exp --set runtestflags=gfortran.dg/dg.exp --set runtestflags=gfortran.dg/guality/guality.exp --set runtestflags=gfortran.dg/lto/lto.exp --set runtestflags=gfortran.dg/vect/vect.exp --set runtestflags=gfortran.fortran-torture/execute/execute.exp --set runtestflags=libatomic.c/c.exp --set runtestflags=libgomp.c++/c++.exp --set runtestflags=libgomp.c/c.exp --set runtestflags=libgomp.fortran/fortran.exp --set runtestflags=libgomp.oacc-c++/c++.exp --set runtestflags=libgomp.oacc-c/c.exp --set runtestflags=libgomp.oacc-fortran/fortran.exp --set runtestflags=libitm.c++/c++.exp --set runtestflags=libitm.c/c.exp --set runtestflags=libstdc++-abi/abi.exp --set runtestflags=libstdc++-dg/conformance.exp --set runtestflags=libstdc++-prettyprinters/prettyprinters.exp --set runtestflags=libstdc++-xmethods/xmethods.exp: 1 # Getting actual results from build directory /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/libitm.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/libgomp.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/libstdc++.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/g++.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/gcc.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/gfortran.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_0/artifacts/build-ca094af16ce810b1e553e000354b5d64a9b90a1a/sumfiles/libatomic.sum # Manifest: gcc-compare-results/contrib/testsuite-management/flaky.xfail # Getting actual results from build directory base-artifacts/sumfiles # base-artifacts/sumfiles/libitm.sum # base-artifacts/sumfiles/libgomp.sum # base-artifacts/sumfiles/libstdc++.sum # base-artifacts/sumfiles/g++.sum # base-artifacts/sumfiles/gcc.sum # base-artifacts/sumfiles/gfortran.sum # base-artifacts/sumfiles/libatomic.sum # # # Unexpected results in this build (new failures) # === gcc tests === # # Running g++.dg/asan/asan.exp ... # FAIL: c-c++-common/asan/halt_on_error-1.c -O0 execution test # FAIL: c-c++-common/asan/halt_on_error-1.c -O1 execution test # FAIL: c-c++-common/asan/halt_on_error-1.c -O2 execution test # FAIL: c-c++-common/asan/halt_on_error-1.c -O3 -g execution test # FAIL: c-c++-common/asan/halt_on_error-1.c -Os execution test # FAIL: c-c++-common/asan/halt_on_error-1.c -O2 -flto -fno-use-linker-plugin -flto-partition=none execution test # FAIL: c-c++-common/asan/halt_on_error-1.c -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects execution test # # Running g++.dg/coroutines/torture/coro-torture.exp ... # FAIL: g++.dg/coroutines/torture/pr95519-06-grooaf.C -O0 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-06-grooaf.C -O0 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O0 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O0 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O1 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O1 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O2 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O2 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O3 -g (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O3 -g compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -Os (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -Os compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O2 -flto -fno-use-linker-plugin -flto-partition=none (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O2 -flto -fno-use-linker-plugin -flto-partition=none compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95519-07-unhandled-exception.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -O0 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -O0 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -O1 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -O1 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -O2 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -O2 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -O3 -g (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -O3 -g compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -Os (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -Os compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -O2 -flto -fno-use-linker-plugin -flto-partition=none (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -O2 -flto -fno-use-linker-plugin -flto-partition=none compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-01.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-01.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -O0 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -O0 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -O1 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -O1 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -O2 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -O2 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -O3 -g (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -O3 -g compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -Os (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -Os compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -O2 -flto -fno-use-linker-plugin -flto-partition=none (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -O2 -flto -fno-use-linker-plugin -flto-partition=none compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-02.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-02.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -O0 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -O0 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -O1 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -O1 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -O2 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -O2 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -O3 -g (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -O3 -g compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -Os (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -Os compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -O2 -flto -fno-use-linker-plugin -flto-partition=none (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -O2 -flto -fno-use-linker-plugin -flto-partition=none compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-03.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-03.C -O2 -flto -fuse-linker-plugin -fno-fat-lto-objects compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-04.C -O0 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-04.C -O0 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-04.C -O1 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-04.C -O1 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-04.C -O2 (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-04.C -O2 compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-04.C -O3 -g (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-04.C -O3 -g compilation failed to produce executable # FAIL: g++.dg/coroutines/torture/pr95615-04.C -Os (test for excess errors) # UNRESOLVED: g++.dg/coroutines/torture/pr95615-04.C -Os compilation failed to produce executable # ... and 1079 more entries from (for last_good == d826bff6ad62b3bda59f6418147cfbbd2435da0d) # reset_artifacts: -10 # build_abe binutils: -8 # build_abe stage1: -7 # build_abe linux: -6 # build_abe glibc: -5 # build_abe stage2: -4 # build_abe qemu: -3 # build_abe dejagnu: 0 # build_abe check_gcc -- --set runtestflags=g++.dg/asan/asan.exp --set runtestflags=gcc.c-torture/execute/execute.exp --set runtestflags=gcc.dg/asan/asan.exp --set runtestflags=gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp --set runtestflags=gcc.target/aarch64/sve/aarch64-sve.exp --set runtestflags=gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp --set runtestflags=gfortran.dg/dg.exp --set runtestflags=gfortran.dg/ieee/ieee.exp --set runtestflags=g++.dg/analyzer/analyzer.exp --set runtestflags=g++.dg/compat/compat.exp --set runtestflags=g++.dg/compat/struct-layout-1.exp --set runtestflags=g++.dg/coroutines/coroutines.exp --set runtestflags=g++.dg/coroutines/torture/coro-torture.exp --set runtestflags=g++.dg/debug/debug.exp --set runtestflags=g++.dg/debug/dwarf2/dwarf2.exp --set runtestflags=g++.dg/dg.exp --set runtestflags=g++.dg/goacc/goacc.exp --set runtestflags=g++.dg/gomp/gomp.exp --set runtestflags=g++.dg/lto/lto.exp --set runtestflags=g++.dg/pch/pch.exp --set runtestflags=g++.dg/special/ecos.exp --set runtestflags=g++.dg/tls/tls.exp --set runtestflags=g++.dg/tm/tm.exp --set runtestflags=g++.dg/torture/dg-torture.exp --set runtestflags=g++.dg/torture/stackalign/stackalign.exp --set runtestflags=g++.dg/vect/vect.exp --set runtestflags=g++.old-deja/old-deja.exp --set runtestflags=g++.target/aarch64/aarch64.exp --set runtestflags=g++.target/aarch64/sve/aarch64-sve.exp --set runtestflags=g++.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp --set runtestflags=g++.target/aarch64/sve/acle/aarch64-sve-acle.exp --set runtestflags=g++.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp --set runtestflags=gcc.c-torture/compile/compile.exp --set runtestflags=gcc.c-torture/execute/builtins/builtins.exp --set runtestflags=gcc.c-torture/execute/execute.exp --set runtestflags=gcc.c-torture/execute/ieee/ieee.exp --set runtestflags=gcc.c-torture/unsorted/unsorted.exp --set runtestflags=gcc.dg/analyzer/analyzer.exp --set runtestflags=gcc.dg/analyzer/torture/analyzer-torture.exp --set runtestflags=gcc.dg/compat/compat.exp --set runtestflags=gcc.dg/compat/struct-layout-1.exp --set runtestflags=gcc.dg/cpp/cpp.exp --set runtestflags=gcc.dg/cpp/trad/trad.exp --set runtestflags=gcc.dg/debug/debug.exp --set runtestflags=gcc.dg/dg.exp --set runtestflags=gcc.dg/goacc/goacc.exp --set runtestflags=gcc.dg/gomp/gomp.exp --set runtestflags=gcc.dg/ipa/ipa.exp --set runtestflags=gcc.dg/lto/lto.exp --set runtestflags=gcc.dg/pch/pch.exp --set runtestflags=gcc.dg/plugin/plugin.exp --set runtestflags=gcc.dg/special/special.exp --set runtestflags=gcc.dg/sso/sso.exp --set runtestflags=gcc.dg/tm/tm.exp --set runtestflags=gcc.dg/torture/dg-torture.exp --set runtestflags=gcc.dg/torture/stackalign/stackalign.exp --set runtestflags=gcc.dg/tree-ssa/tree-ssa.exp --set runtestflags=gcc.dg/vect/vect.exp --set runtestflags=gcc.dg/weak/weak.exp --set runtestflags=gcc.target/aarch64/aapcs64/aapcs64.exp --set runtestflags=gcc.target/aarch64/aarch64.exp --set runtestflags=gcc.target/aarch64/acle/acle.exp --set runtestflags=gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp --set runtestflags=gcc.target/aarch64/fp16/fp16.exp --set runtestflags=gcc.target/aarch64/simd/simd.exp --set runtestflags=gcc.target/aarch64/sve/aarch64-sve.exp --set runtestflags=gcc.target/aarch64/sve/acle/aarch64-sve-acle-asm.exp --set runtestflags=gcc.target/aarch64/sve/acle/aarch64-sve-acle.exp --set runtestflags=gcc.target/aarch64/sve/pcs/aarch64-sve-pcs.exp --set runtestflags=gcc.target/aarch64/sve2/aarch64-sve2.exp --set runtestflags=gcc.target/aarch64/sve2/acle/aarch64-sve2-acle-asm.exp --set runtestflags=gcc.target/aarch64/sve2/acle/aarch64-sve2-acle.exp --set runtestflags=gcc.target/aarch64/torture/aarch64-torture.exp --set runtestflags=gfortran.dg/coarray/caf.exp --set runtestflags=gfortran.dg/dg.exp --set runtestflags=gfortran.dg/guality/guality.exp --set runtestflags=gfortran.dg/lto/lto.exp --set runtestflags=gfortran.dg/vect/vect.exp --set runtestflags=gfortran.fortran-torture/execute/execute.exp --set runtestflags=libatomic.c/c.exp --set runtestflags=libgomp.c++/c++.exp --set runtestflags=libgomp.c/c.exp --set runtestflags=libgomp.fortran/fortran.exp --set runtestflags=libgomp.oacc-c++/c++.exp --set runtestflags=libgomp.oacc-c/c.exp --set runtestflags=libgomp.oacc-fortran/fortran.exp --set runtestflags=libitm.c++/c++.exp --set runtestflags=libitm.c/c.exp --set runtestflags=libstdc++-abi/abi.exp --set runtestflags=libstdc++-dg/conformance.exp --set runtestflags=libstdc++-prettyprinters/prettyprinters.exp --set runtestflags=libstdc++-xmethods/xmethods.exp: 1 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Build top page/logs: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Configuration details: Reproduce builds: <cut> mkdir investigate-gcc-ca094af16ce810b1e553e000354b5d64a9b90a1a cd investigate-gcc-ca094af16ce810b1e553e000354b5d64a9b90a1a git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh cd gcc # Reproduce first_bad build git checkout --detach ca094af16ce810b1e553e000354b5d64a9b90a1a ../artifacts/test.sh # Reproduce last_good build git checkout --detach d826bff6ad62b3bda59f6418147cfbbd2435da0d ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Build log: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Full commit (up to 1000 lines): <cut> commit ca094af16ce810b1e553e000354b5d64a9b90a1a Author: Eric Botcazou <ebotcazou(a)adacore.com> Date: Fri Jul 9 18:30:54 2021 +0200 Missing piece in earlier change gcc/ada/ * gcc-interface/utils.c (finish_subprog_decl): Remove obsolete line. --- gcc/ada/gcc-interface/utils.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 63a0ad9461e..abb456216c7 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -3438,9 +3438,6 @@ finish_subprog_decl (tree decl, tree asm_name, tree type) DECL_BY_REFERENCE (result_decl) = TREE_ADDRESSABLE (type); DECL_RESULT (decl) = result_decl; - /* Propagate the "const" property. */ - TREE_READONLY (decl) = TYPE_READONLY (type); - /* Propagate the "pure" property. */ DECL_PURE_P (decl) = TYPE_RESTRICT (type); </cut>

4 years, 3 months

[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/llvm-master-arm-spec2k6-O2 - Build # 8 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tk1/llvm-master-arm-spec2k6-O2. So far, this commit has regressed CI configurations: - tcwg_bmk_llvm_tk1/llvm-master-arm-spec2k6-O2 Culprit: <cut> commit 87065c0d242d955e6f3fddf5cbc790d025c3521c Author: Guillaume Chatelet <gchatelet(a)google.com> Date: Wed Jun 23 14:19:40 2021 +0000 [libc] add benchmarks for memcmp and bzero Differential Revision: https://reviews.llvm.org/D104511 </cut> Results regressed to (for first_bad == 87065c0d242d955e6f3fddf5cbc790d025c3521c) # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -8 # build_abe linux: -7 # build_abe glibc: -6 # build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -5 # build_llvm true: -3 # true: 0 # benchmark -O2_marm -- artifacts/build-87065c0d242d955e6f3fddf5cbc790d025c3521c/results_id: 1 # 400.perlbench,perlbench_base.default regressed by 103 from (for last_good == c125af82a5ff5dbbbcb8ebc5cde156d41e6ac281) # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -8 # build_abe linux: -7 # build_abe glibc: -6 # build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -5 # build_llvm true: -3 # true: 0 # benchmark -O2_marm -- artifacts/build-c125af82a5ff5dbbbcb8ebc5cde156d41e6ac281/results_id: 1 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Results ID of last_good: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-master-arm-spec2k6-O2/1292 Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Results ID of first_bad: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-master-arm-spec2k6-O2/1297 Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Configuration details: Reproduce builds: <cut> mkdir investigate-llvm-87065c0d242d955e6f3fddf5cbc790d025c3521c cd investigate-llvm-87065c0d242d955e6f3fddf5cbc790d025c3521c git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh cd llvm # Reproduce first_bad build git checkout --detach 87065c0d242d955e6f3fddf5cbc790d025c3521c ../artifacts/test.sh # Reproduce last_good build git checkout --detach c125af82a5ff5dbbbcb8ebc5cde156d41e6ac281 ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Full commit (up to 1000 lines): <cut> commit 87065c0d242d955e6f3fddf5cbc790d025c3521c Author: Guillaume Chatelet <gchatelet(a)google.com> Date: Wed Jun 23 14:19:40 2021 +0000 [libc] add benchmarks for memcmp and bzero Differential Revision: https://reviews.llvm.org/D104511 --- libc/benchmarks/CMakeLists.txt | 2 ++ libc/benchmarks/LibcMemoryBenchmarkMain.cpp | 47 +++++++++++++++++++++++++++-- libc/src/string/CMakeLists.txt | 38 +++++++++++++++++------ 3 files changed, 75 insertions(+), 12 deletions(-) diff --git a/libc/benchmarks/CMakeLists.txt b/libc/benchmarks/CMakeLists.txt index feff80cf4501..390b802bd8f7 100644 --- a/libc/benchmarks/CMakeLists.txt +++ b/libc/benchmarks/CMakeLists.txt @@ -169,3 +169,5 @@ endfunction() add_libc_multi_impl_benchmark(memcpy) add_libc_multi_impl_benchmark(memset) +add_libc_multi_impl_benchmark(bzero) +add_libc_multi_impl_benchmark(memcmp) diff --git a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp index e3d455423de2..6fa01ede52e3 100644 --- a/libc/benchmarks/LibcMemoryBenchmarkMain.cpp +++ b/libc/benchmarks/LibcMemoryBenchmarkMain.cpp @@ -17,10 +17,14 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" +#include <cstring> + namespace __llvm_libc { extern void *memcpy(void *__restrict, const void *__restrict, size_t); extern void *memset(void *, int, size_t); +extern void bzero(void *, size_t); +extern int memcmp(const void *, const void *, size_t); } // namespace __llvm_libc @@ -79,7 +83,7 @@ struct Benchmark { return [this](ParameterType P) { __llvm_libc::memcpy(DstBuffer + P.OffsetBytes, SrcBuffer + P.OffsetBytes, P.SizeBytes); - return DstBuffer + P.OffsetBytes; + return DstBuffer[P.OffsetBytes]; }; } @@ -97,18 +101,55 @@ struct Benchmark { return [this](ParameterType P) { __llvm_libc::memset(DstBuffer + P.OffsetBytes, P.OffsetBytes & 0xFF, P.SizeBytes); - return DstBuffer + P.OffsetBytes; + return DstBuffer[P.OffsetBytes]; + }; + } + + AlignedBuffer DstBuffer; +}; +#elif defined(LIBC_BENCHMARK_FUNCTION_BZERO) +struct Benchmark { + static constexpr auto GetDistributions = &getMemsetSizeDistributions; + static constexpr size_t BufferCount = 1; + + Benchmark(const size_t BufferSize) : DstBuffer(BufferSize) {} + + inline auto functor() { + return [this](ParameterType P) { + __llvm_libc::bzero(DstBuffer + P.OffsetBytes, P.SizeBytes); + return DstBuffer[P.OffsetBytes]; }; } AlignedBuffer DstBuffer; }; +#elif defined(LIBC_BENCHMARK_FUNCTION_MEMCMP) +struct Benchmark { + static constexpr auto GetDistributions = &getMemcmpSizeDistributions; + static constexpr size_t BufferCount = 2; + + Benchmark(const size_t BufferSize) + : BufferA(BufferSize), BufferB(BufferSize) { + // The memcmp buffers always compare equal. + memset(BufferA.begin(), 0xF, BufferSize); + memset(BufferB.begin(), 0xF, BufferSize); + } + + inline auto functor() { + return [this](ParameterType P) { + return __llvm_libc::memcmp(BufferA + P.OffsetBytes, + BufferB + P.OffsetBytes, P.SizeBytes); + }; + } + + AlignedBuffer BufferA; + AlignedBuffer BufferB; +}; #else #error "Missing LIBC_BENCHMARK_FUNCTION_XXX definition" #endif struct Harness : Benchmark { - Harness(const size_t BufferSize, size_t BatchParameterCount, std::function<unsigned()> SizeSampler, std::function<unsigned()> OffsetSampler) diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt index 4dd8ee0bf4a2..97ac99cb89fe 100644 --- a/libc/src/string/CMakeLists.txt +++ b/libc/src/string/CMakeLists.txt @@ -58,14 +58,6 @@ add_entrypoint_object( .string_utils ) -add_entrypoint_object( - memcmp - SRCS - memcmp.cpp - HDRS - memcmp.h -) - add_entrypoint_object( memmove SRCS @@ -280,7 +272,6 @@ function(add_bzero bzero_name) .memory_utils.memory_utils libc.include.string COMPILE_OPTIONS - -fno-builtin-memset -fno-builtin-bzero ${ARGN} ) @@ -297,3 +288,32 @@ else() add_bzero(bzero_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE}) add_bzero(bzero) endif() + +# ------------------------------------------------------------------------------ +# memcmp +# ------------------------------------------------------------------------------ + +function(add_memcmp memcmp_name) + add_implementation(memcmp ${memcmp_name} + SRCS ${LIBC_SOURCE_DIR}/src/string/memcmp.cpp + HDRS ${LIBC_SOURCE_DIR}/src/string/memcmp.h + DEPENDS + .memory_utils.memory_utils + libc.include.string + COMPILE_OPTIONS + -fno-builtin-memcmp + ${ARGN} + ) +endfunction() + +if(${LIBC_TARGET_ARCHITECTURE_IS_X86}) + add_memcmp(memcmp_x86_64_opt_sse2 COMPILE_OPTIONS -march=k8 REQUIRE SSE2) + add_memcmp(memcmp_x86_64_opt_sse4 COMPILE_OPTIONS -march=nehalem REQUIRE SSE4_2) + add_memcmp(memcmp_x86_64_opt_avx2 COMPILE_OPTIONS -march=haswell REQUIRE AVX2) + add_memcmp(memcmp_x86_64_opt_avx512 COMPILE_OPTIONS -march=skylake-avx512 REQUIRE AVX512F) + add_memcmp(memcmp_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE}) + add_memcmp(memcmp) +else() + add_memcmp(memcmp_opt_host COMPILE_OPTIONS ${LIBC_COMPILE_OPTIONS_NATIVE}) + add_memcmp(memcmp) +endif() </cut>

4 years, 3 months

[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/gnu-master-arm-spec2k6-O2 - Build # 15 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *glibc* in CI configuration tcwg_bmk_gnu_tk1/gnu-master-arm-spec2k6-O2. So far, this commit has regressed CI configurations: - tcwg_bmk_gnu_tk1/gnu-master-arm-spec2k6-O2 Culprit: <cut> commit 2da5f22fff639e891b9f516724683d9d7ad1511c Author: Florian Weimer <fweimer(a)redhat.com> Date: Fri Jun 25 10:42:52 2021 +0200 Linux: Move mq_notify from librt to libc The symbol was moved using scripts/move-symbol-to-libc.py. An explicit call from fork into the mq_notify implementation replaces the previous use of pthread_atfork. Reviewed-by: Adhemerva Zanella <adhemerval.zanella(a)linaro.org> </cut> Results regressed to (for first_bad == 2da5f22fff639e891b9f516724683d9d7ad1511c) # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -8 # build_abe linux: -7 # build_abe glibc: -6 # build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -5 # true: 0 # benchmark -O2_marm -- artifacts/build-2da5f22fff639e891b9f516724683d9d7ad1511c/results_id: 1 # 481.wrf,[.] __module_small_step_em_MOD_advance_uv regressed by 117 from (for last_good == f66d9abca7ecc4ee4c7afcc1d1496411bfc70911) # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -8 # build_abe linux: -7 # build_abe glibc: -6 # build_abe stage2 -- --set gcc_override_configure=--with-mode=arm --set gcc_override_configure=--disable-libsanitizer: -5 # true: 0 # benchmark -O2_marm -- artifacts/build-f66d9abca7ecc4ee4c7afcc1d1496411bfc70911/results_id: 1 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… Results ID of last_good: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-master-arm-spec2k6-O2/1284 Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… Results ID of first_bad: tk1_32/tcwg_bmk_gnu_tk1/bisect-gnu-master-arm-spec2k6-O2/1277 Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… Configuration details: Reproduce builds: <cut> mkdir investigate-glibc-2da5f22fff639e891b9f516724683d9d7ad1511c cd investigate-glibc-2da5f22fff639e891b9f516724683d9d7ad1511c git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh cd glibc # Reproduce first_bad build git checkout --detach 2da5f22fff639e891b9f516724683d9d7ad1511c ../artifacts/test.sh # Reproduce last_good build git checkout --detach f66d9abca7ecc4ee4c7afcc1d1496411bfc70911 ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… Build log: https://ci.linaro.org/job/tcwg_bmk_ci_gnu-bisect-tcwg_bmk_tk1-gnu-master-ar… Full commit (up to 1000 lines): <cut> commit 2da5f22fff639e891b9f516724683d9d7ad1511c Author: Florian Weimer <fweimer(a)redhat.com> Date: Fri Jun 25 10:42:52 2021 +0200 Linux: Move mq_notify from librt to libc The symbol was moved using scripts/move-symbol-to-libc.py. An explicit call from fork into the mq_notify implementation replaces the previous use of pthread_atfork. Reviewed-by: Adhemerva Zanella <adhemerval.zanella(a)linaro.org> --- include/mqueue.h | 4 ++ include/pthread.h | 3 ++ rt/Makefile | 2 +- rt/Versions | 4 +- sysdeps/nptl/fork.h | 3 ++ sysdeps/unix/sysv/linux/aarch64/libc.abilist | 2 + sysdeps/unix/sysv/linux/aarch64/librt.abilist | 1 - sysdeps/unix/sysv/linux/alpha/libc.abilist | 2 + sysdeps/unix/sysv/linux/alpha/librt.abilist | 1 - sysdeps/unix/sysv/linux/arc/libc.abilist | 2 + sysdeps/unix/sysv/linux/arc/librt.abilist | 1 - sysdeps/unix/sysv/linux/arm/be/libc.abilist | 2 + sysdeps/unix/sysv/linux/arm/be/librt.abilist | 1 - sysdeps/unix/sysv/linux/arm/le/libc.abilist | 2 + sysdeps/unix/sysv/linux/arm/le/librt.abilist | 1 - sysdeps/unix/sysv/linux/csky/libc.abilist | 2 + sysdeps/unix/sysv/linux/csky/librt.abilist | 1 - sysdeps/unix/sysv/linux/hppa/libc.abilist | 2 + sysdeps/unix/sysv/linux/hppa/librt.abilist | 1 - sysdeps/unix/sysv/linux/i386/libc.abilist | 2 + sysdeps/unix/sysv/linux/i386/librt.abilist | 1 - sysdeps/unix/sysv/linux/ia64/libc.abilist | 2 + sysdeps/unix/sysv/linux/ia64/librt.abilist | 1 - sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist | 2 + .../unix/sysv/linux/m68k/coldfire/librt.abilist | 1 - sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist | 2 + sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist | 1 - sysdeps/unix/sysv/linux/microblaze/be/libc.abilist | 2 + .../unix/sysv/linux/microblaze/be/librt.abilist | 1 - sysdeps/unix/sysv/linux/microblaze/le/libc.abilist | 2 + .../unix/sysv/linux/microblaze/le/librt.abilist | 1 - .../unix/sysv/linux/mips/mips32/fpu/libc.abilist | 2 + sysdeps/unix/sysv/linux/mips/mips32/librt.abilist | 1 - .../unix/sysv/linux/mips/mips32/nofpu/libc.abilist | 2 + .../unix/sysv/linux/mips/mips64/n32/libc.abilist | 2 + .../unix/sysv/linux/mips/mips64/n32/librt.abilist | 1 - .../unix/sysv/linux/mips/mips64/n64/libc.abilist | 2 + .../unix/sysv/linux/mips/mips64/n64/librt.abilist | 1 - sysdeps/unix/sysv/linux/mq_notify.c | 59 +++++++++------------- sysdeps/unix/sysv/linux/nios2/libc.abilist | 2 + sysdeps/unix/sysv/linux/nios2/librt.abilist | 1 - .../sysv/linux/powerpc/powerpc32/fpu/libc.abilist | 2 + .../sysv/linux/powerpc/powerpc32/librt.abilist | 1 - .../linux/powerpc/powerpc32/nofpu/libc.abilist | 2 + .../sysv/linux/powerpc/powerpc64/be/libc.abilist | 2 + .../sysv/linux/powerpc/powerpc64/be/librt.abilist | 1 - .../sysv/linux/powerpc/powerpc64/le/libc.abilist | 2 + .../sysv/linux/powerpc/powerpc64/le/librt.abilist | 1 - sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist | 2 + sysdeps/unix/sysv/linux/riscv/rv32/librt.abilist | 1 - sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist | 2 + sysdeps/unix/sysv/linux/riscv/rv64/librt.abilist | 1 - sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist | 2 + sysdeps/unix/sysv/linux/s390/s390-32/librt.abilist | 1 - sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 2 + sysdeps/unix/sysv/linux/s390/s390-64/librt.abilist | 1 - sysdeps/unix/sysv/linux/sh/be/libc.abilist | 2 + sysdeps/unix/sysv/linux/sh/be/librt.abilist | 1 - sysdeps/unix/sysv/linux/sh/le/libc.abilist | 2 + sysdeps/unix/sysv/linux/sh/le/librt.abilist | 1 - sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist | 2 + .../unix/sysv/linux/sparc/sparc32/librt.abilist | 1 - sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist | 2 + .../unix/sysv/linux/sparc/sparc64/librt.abilist | 1 - sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 2 + sysdeps/unix/sysv/linux/x86_64/64/librt.abilist | 1 - sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist | 2 + sysdeps/unix/sysv/linux/x86_64/x32/librt.abilist | 1 - 68 files changed, 101 insertions(+), 68 deletions(-) diff --git a/include/mqueue.h b/include/mqueue.h index 008589f0fa..2c40c1e3fc 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -15,6 +15,10 @@ hidden_proto (mq_setattr) # if PTHREAD_IN_LIBC libc_hidden_proto (mq_setattr) + +/* Called from fork so that the new subprocess re-creates the + notification thread if necessary. */ +void __mq_notify_fork_subprocess (void) attribute_hidden; # endif #include <struct___timespec64.h> diff --git a/include/pthread.h b/include/pthread.h index 1158919247..819bf3f235 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -13,6 +13,9 @@ libc_hidden_proto (__pthread_barrier_init) #endif extern int __pthread_barrier_wait (pthread_barrier_t *__barrier) __THROWNL __nonnull ((1)); +#if PTHREAD_IN_LIBC +libc_hidden_proto (__pthread_barrier_wait) +#endif /* This function is called to initialize the pthread library. */ extern void __pthread_initialize (void) __attribute__ ((weak)); diff --git a/rt/Makefile b/rt/Makefile index f753a9aa7a..e86a3107ee 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,7 +30,6 @@ routines = \ librt-routines = \ librt-compat \ - mq_notify \ mq_open \ mq_receive \ mq_send \ @@ -62,6 +61,7 @@ $(librt-routines-var) += \ lio_listio64 \ mq_close \ mq_getattr \ + mq_notify \ mq_setattr \ tests := tst-shm tst-timer tst-timer2 \ diff --git a/rt/Versions b/rt/Versions index 38f23c16ef..b3c9bba9ff 100644 --- a/rt/Versions +++ b/rt/Versions @@ -28,6 +28,7 @@ libc { %if PTHREAD_IN_LIBC mq_close; mq_getattr; + mq_notify; mq_setattr; %endif } @@ -58,6 +59,7 @@ libc { lio_listio64; mq_close; mq_getattr; + mq_notify; mq_setattr; %endif shm_open; @@ -112,9 +114,9 @@ librt { %if !PTHREAD_IN_LIBC mq_close; mq_getattr; + mq_notify; mq_setattr; %endif - mq_notify; mq_open; mq_receive; mq_send; diff --git a/sysdeps/nptl/fork.h b/sysdeps/nptl/fork.h index 3134d7ab94..1fc3a83bd3 100644 --- a/sysdeps/nptl/fork.h +++ b/sysdeps/nptl/fork.h @@ -22,6 +22,7 @@ #include <assert.h> #include <ldsodefs.h> #include <list.h> +#include <mqueue.h> #include <pthreadP.h> #include <sysdep.h> @@ -41,6 +42,8 @@ fork_system_setup_after_fork (void) /* Initialize thread library locks. */ GL (dl_stack_cache_lock) = LLL_LOCK_INITIALIZER; __default_pthread_attr_lock = LLL_LOCK_INITIALIZER; + + call_function_static_weak (__mq_notify_fork_subprocess); } /* In case of a fork() call the memory allocation in the child will be diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index c6b225527c..98dd344aaf 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1359,6 +1359,7 @@ GLIBC_2.17 mprobe F GLIBC_2.17 mprotect F GLIBC_2.17 mq_close F GLIBC_2.17 mq_getattr F +GLIBC_2.17 mq_notify F GLIBC_2.17 mq_setattr F GLIBC_2.17 mrand48 F GLIBC_2.17 mrand48_r F @@ -2404,6 +2405,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/aarch64/librt.abilist b/sysdeps/unix/sysv/linux/aarch64/librt.abilist index 33b825d874..6cab033b12 100644 --- a/sysdeps/unix/sysv/linux/aarch64/librt.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.17 __mq_open_2 F -GLIBC_2.17 mq_notify F GLIBC_2.17 mq_open F GLIBC_2.17 mq_receive F GLIBC_2.17 mq_send F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 4930bfef60..5026e54d51 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2394,6 +2394,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2499,6 +2500,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/alpha/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist index 29f9030371..d85884d888 100644 --- a/sysdeps/unix/sysv/linux/alpha/librt.abilist +++ b/sysdeps/unix/sysv/linux/alpha/librt.abilist @@ -10,7 +10,6 @@ GLIBC_2.3.3 timer_delete F GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 78a01ca136..f677395bd2 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1290,6 +1290,7 @@ GLIBC_2.32 mprobe F GLIBC_2.32 mprotect F GLIBC_2.32 mq_close F GLIBC_2.32 mq_getattr F +GLIBC_2.32 mq_notify F GLIBC_2.32 mq_setattr F GLIBC_2.32 mrand48 F GLIBC_2.32 mrand48_r F @@ -2163,6 +2164,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/arc/librt.abilist b/sysdeps/unix/sysv/linux/arc/librt.abilist index 4143924c8b..16864093a0 100644 --- a/sysdeps/unix/sysv/linux/arc/librt.abilist +++ b/sysdeps/unix/sysv/linux/arc/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.32 __mq_open_2 F -GLIBC_2.32 mq_notify F GLIBC_2.32 mq_open F GLIBC_2.32 mq_receive F GLIBC_2.32 mq_send F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index 4ad531fb76..38e6fc61d4 100644 --- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist @@ -315,6 +315,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F @@ -1731,6 +1732,7 @@ GLIBC_2.4 mprobe F GLIBC_2.4 mprotect F GLIBC_2.4 mq_close F GLIBC_2.4 mq_getattr F +GLIBC_2.4 mq_notify F GLIBC_2.4 mq_setattr F GLIBC_2.4 mrand48 F GLIBC_2.4 mrand48_r F diff --git a/sysdeps/unix/sysv/linux/arm/be/librt.abilist b/sysdeps/unix/sysv/linux/arm/be/librt.abilist index ba9f5f6422..6d3cb7c1fa 100644 --- a/sysdeps/unix/sysv/linux/arm/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/be/librt.abilist @@ -2,7 +2,6 @@ GLIBC_2.34 __mq_timedreceive_time64 F GLIBC_2.34 __mq_timedsend_time64 F GLIBC_2.34 __timer_gettime64 F GLIBC_2.34 __timer_settime64 F -GLIBC_2.4 mq_notify F GLIBC_2.4 mq_open F GLIBC_2.4 mq_receive F GLIBC_2.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist index aae2e215f3..c31f58229a 100644 --- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist @@ -312,6 +312,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F @@ -1728,6 +1729,7 @@ GLIBC_2.4 mprobe F GLIBC_2.4 mprotect F GLIBC_2.4 mq_close F GLIBC_2.4 mq_getattr F +GLIBC_2.4 mq_notify F GLIBC_2.4 mq_setattr F GLIBC_2.4 mrand48 F GLIBC_2.4 mrand48_r F diff --git a/sysdeps/unix/sysv/linux/arm/le/librt.abilist b/sysdeps/unix/sysv/linux/arm/le/librt.abilist index ba9f5f6422..6d3cb7c1fa 100644 --- a/sysdeps/unix/sysv/linux/arm/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/le/librt.abilist @@ -2,7 +2,6 @@ GLIBC_2.34 __mq_timedreceive_time64 F GLIBC_2.34 __mq_timedsend_time64 F GLIBC_2.34 __timer_gettime64 F GLIBC_2.34 __timer_settime64 F -GLIBC_2.4 mq_notify F GLIBC_2.4 mq_open F GLIBC_2.4 mq_receive F GLIBC_2.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist index 0bbe74a51a..bd0cec183d 100644 --- a/sysdeps/unix/sysv/linux/csky/libc.abilist +++ b/sysdeps/unix/sysv/linux/csky/libc.abilist @@ -1345,6 +1345,7 @@ GLIBC_2.29 mprobe F GLIBC_2.29 mprotect F GLIBC_2.29 mq_close F GLIBC_2.29 mq_getattr F +GLIBC_2.29 mq_notify F GLIBC_2.29 mq_setattr F GLIBC_2.29 mrand48 F GLIBC_2.29 mrand48_r F @@ -2424,6 +2425,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/csky/librt.abilist b/sysdeps/unix/sysv/linux/csky/librt.abilist index 1ffc068f62..7c20548140 100644 --- a/sysdeps/unix/sysv/linux/csky/librt.abilist +++ b/sysdeps/unix/sysv/linux/csky/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.29 __mq_open_2 F -GLIBC_2.29 mq_notify F GLIBC_2.29 mq_open F GLIBC_2.29 mq_receive F GLIBC_2.29 mq_send F diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist index f96ed60028..e089d91a80 100644 --- a/sysdeps/unix/sysv/linux/hppa/libc.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist @@ -2208,6 +2208,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2378,6 +2379,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/hppa/librt.abilist b/sysdeps/unix/sysv/linux/hppa/librt.abilist index d208e7b7a8..c4164f4149 100644 --- a/sysdeps/unix/sysv/linux/hppa/librt.abilist +++ b/sysdeps/unix/sysv/linux/hppa/librt.abilist @@ -4,7 +4,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index a724074718..d04f1e1a95 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -2389,6 +2389,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2562,6 +2563,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/i386/librt.abilist b/sysdeps/unix/sysv/linux/i386/librt.abilist index d208e7b7a8..c4164f4149 100644 --- a/sysdeps/unix/sysv/linux/i386/librt.abilist +++ b/sysdeps/unix/sysv/linux/i386/librt.abilist @@ -4,7 +4,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index 3b5c72f307..c7569a5138 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -2243,6 +2243,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2337,6 +2338,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/ia64/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist index 38edc31e90..1ec96c2786 100644 --- a/sysdeps/unix/sysv/linux/ia64/librt.abilist +++ b/sysdeps/unix/sysv/linux/ia64/librt.abilist @@ -9,7 +9,6 @@ GLIBC_2.3.3 timer_delete F GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 85de809b2d..57139d935a 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -316,6 +316,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F @@ -1715,6 +1716,7 @@ GLIBC_2.4 mprobe F GLIBC_2.4 mprotect F GLIBC_2.4 mq_close F GLIBC_2.4 mq_getattr F +GLIBC_2.4 mq_notify F GLIBC_2.4 mq_setattr F GLIBC_2.4 mrand48 F GLIBC_2.4 mrand48_r F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist index ba9f5f6422..6d3cb7c1fa 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist @@ -2,7 +2,6 @@ GLIBC_2.34 __mq_timedreceive_time64 F GLIBC_2.34 __mq_timedsend_time64 F GLIBC_2.34 __timer_gettime64 F GLIBC_2.34 __timer_settime64 F -GLIBC_2.4 mq_notify F GLIBC_2.4 mq_open F GLIBC_2.4 mq_receive F GLIBC_2.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index a9abdfa950..5fd9bf57ec 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -2332,6 +2332,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2505,6 +2506,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist index d208e7b7a8..c4164f4149 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist @@ -4,7 +4,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist index 6bf22e63e3..434b3f6844 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist @@ -1361,6 +1361,7 @@ GLIBC_2.18 mprobe F GLIBC_2.18 mprotect F GLIBC_2.18 mq_close F GLIBC_2.18 mq_getattr F +GLIBC_2.18 mq_notify F GLIBC_2.18 mq_setattr F GLIBC_2.18 mrand48 F GLIBC_2.18 mrand48_r F @@ -2475,6 +2476,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist index a8bbeb6a20..f82d9ba705 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.18 __mq_open_2 F -GLIBC_2.18 mq_notify F GLIBC_2.18 mq_open F GLIBC_2.18 mq_receive F GLIBC_2.18 mq_send F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist index 4e211638c9..1d97080a9c 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist @@ -1361,6 +1361,7 @@ GLIBC_2.18 mprobe F GLIBC_2.18 mprotect F GLIBC_2.18 mq_close F GLIBC_2.18 mq_getattr F +GLIBC_2.18 mq_notify F GLIBC_2.18 mq_setattr F GLIBC_2.18 mrand48 F GLIBC_2.18 mrand48_r F @@ -2472,6 +2473,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist index a8bbeb6a20..f82d9ba705 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.18 __mq_open_2 F -GLIBC_2.18 mq_notify F GLIBC_2.18 mq_open F GLIBC_2.18 mq_receive F GLIBC_2.18 mq_send F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist index 96d2e57a71..d43b66902d 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist @@ -2300,6 +2300,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2470,6 +2471,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist index 7704fd1722..12c3cbae0d 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/librt.abilist @@ -3,7 +3,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist index 3f8736354d..86dfc85225 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist @@ -2298,6 +2298,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2468,6 +2469,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist index ab6ca602b9..3314c50b3c 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist @@ -2306,6 +2306,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2476,6 +2477,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist index 7704fd1722..12c3cbae0d 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/librt.abilist @@ -3,7 +3,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist index 328abb0e02..a23ebf24a8 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist @@ -2300,6 +2300,7 @@ GLIBC_2.3.4 getipv4sourcefilter F GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2393,6 +2394,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist index a249a4623f..7afe4e83cf 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/librt.abilist @@ -3,7 +3,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c index e22850a910..9799dcdaa4 100644 --- a/sysdeps/unix/sysv/linux/mq_notify.c +++ b/sysdeps/unix/sysv/linux/mq_notify.c @@ -29,7 +29,7 @@ #include <sys/socket.h> #include <not-cancel.h> #include <pthreadP.h> - +#include <shlib-compat.h> /* Defined in the kernel headers: */ #define NOTIFY_COOKIE_LEN 32 /* Length of the cookie used. */ @@ -75,7 +75,7 @@ change_sigmask (int how, sigset_t *oss) { sigset_t ss; sigfillset (&ss); - return pthread_sigmask (how, &ss, oss); + return __pthread_sigmask (how, &ss, oss); } @@ -93,7 +93,7 @@ notification_function (void *arg) (void) __pthread_barrier_wait (&notify_barrier); /* Make the thread detached. */ - (void) pthread_detach (pthread_self ()); + __pthread_detach (__pthread_self ()); /* The parent thread has all signals blocked. This is probably a bit surprising for this thread. So we unblock all of them. */ @@ -125,9 +125,8 @@ helper_thread (void *arg) /* Just create the thread as instructed. There is no way to report a problem with creating a thread. */ pthread_t th; - if (__builtin_expect (pthread_create (&th, data.attr, - notification_function, &data) - == 0, 0)) + if (__pthread_create (&th, data.attr, notification_function, &data) + == 0) /* Since we passed a pointer to DATA to the new thread we have to wait until it is done with it. */ (void) __pthread_barrier_wait (&notify_barrier); @@ -135,7 +134,7 @@ helper_thread (void *arg) else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) { /* The only state we keep is the copy of the thread attributes. */ - pthread_attr_destroy (data.attr); + __pthread_attr_destroy (data.attr); free (data.attr); } } @@ -143,8 +142,8 @@ helper_thread (void *arg) } -static void -reset_once (void) +void +__mq_notify_fork_subprocess (void) { once = PTHREAD_ONCE_INIT; } @@ -167,15 +166,14 @@ init_mq_netlink (void) int err = 1; /* Initialize the barrier. */ - if (__builtin_expect (__pthread_barrier_init (&notify_barrier, NULL, 2) == 0, - 0)) + if (__pthread_barrier_init (&notify_barrier, NULL, 2) == 0) { /* Create the helper thread. */ pthread_attr_t attr; - (void) pthread_attr_init (&attr); - (void) pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); + __pthread_attr_init (&attr); + __pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); /* We do not need much stack space, the bare minimum will be enough. */ - (void) pthread_attr_setstacksize (&attr, __pthread_get_minstack (&attr)); + __pthread_attr_setstacksize (&attr, __pthread_get_minstack (&attr)); /* Temporarily block all signals so that the newly created thread inherits the mask. */ @@ -183,29 +181,13 @@ init_mq_netlink (void) int have_no_oss = change_sigmask (SIG_BLOCK, &oss); pthread_t th; - err = pthread_create (&th, &attr, helper_thread, NULL); + err = __pthread_create (&th, &attr, helper_thread, NULL); /* Reset the signal mask. */ if (!have_no_oss) - pthread_sigmask (SIG_SETMASK, &oss, NULL); - - (void) pthread_attr_destroy (&attr); + __pthread_sigmask (SIG_SETMASK, &oss, NULL); - if (err == 0) - { - static int added_atfork; - - if (added_atfork == 0 - && pthread_atfork (NULL, NULL, reset_once) != 0) - { - /* The child thread will call recv() which is a - cancellation point. */ - (void) pthread_cancel (th); - err = 1; - } - else - added_atfork = 1; - } + __pthread_attr_destroy (&attr); } if (err != 0) @@ -219,7 +201,7 @@ init_mq_netlink (void) /* Register notification upon message arrival to an empty message queue MQDES. */ int -mq_notify (mqd_t mqdes, const struct sigevent *notification) +__mq_notify (mqd_t mqdes, const struct sigevent *notification) { /* Make sure the type is correctly defined. */ assert (sizeof (union notify_data) == NOTIFY_COOKIE_LEN); @@ -235,7 +217,7 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) response. */ /* Initialize only once. */ - pthread_once (&once, init_mq_netlink); + __pthread_once (&once, init_mq_netlink); /* If we cannot create the netlink socket we cannot provide SIGEV_THREAD support. */ @@ -280,9 +262,14 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) /* If it failed, free the allocated memory. */ if (retval != 0 && data.attr != NULL) { - pthread_attr_destroy (data.attr); + __pthread_attr_destroy (data.attr); free (data.attr); } return retval; } +versioned_symbol (libc, __mq_notify, mq_notify, GLIBC_2_34); +libc_hidden_ver (__mq_notify, mq_notify) +#if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3_4, GLIBC_2_34) +compat_symbol (librt, __mq_notify, mq_notify, GLIBC_2_3_4); +#endif diff --git a/sysdeps/unix/sysv/linux/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist index b8dd80465f..50b5f57efc 100644 --- a/sysdeps/unix/sysv/linux/nios2/libc.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist @@ -1404,6 +1404,7 @@ GLIBC_2.21 mprobe F GLIBC_2.21 mprotect F GLIBC_2.21 mq_close F GLIBC_2.21 mq_getattr F +GLIBC_2.21 mq_notify F GLIBC_2.21 mq_setattr F GLIBC_2.21 mrand48 F GLIBC_2.21 mrand48_r F @@ -2514,6 +2515,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/nios2/librt.abilist b/sysdeps/unix/sysv/linux/nios2/librt.abilist index 64a169169f..0ad1b47423 100644 --- a/sysdeps/unix/sysv/linux/nios2/librt.abilist +++ b/sysdeps/unix/sysv/linux/nios2/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.21 __mq_open_2 F -GLIBC_2.21 mq_notify F GLIBC_2.21 mq_open F GLIBC_2.21 mq_receive F GLIBC_2.21 mq_send F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist index 04a263f810..c8b663ff2f 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist @@ -2346,6 +2346,7 @@ GLIBC_2.3.4 longjmp F GLIBC_2.3.4 makecontext F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2532,6 +2533,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist index d208e7b7a8..c4164f4149 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist @@ -4,7 +4,6 @@ GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist index 9e8043323c..551af732bb 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist @@ -2379,6 +2379,7 @@ GLIBC_2.3.4 longjmp F GLIBC_2.3.4 makecontext F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2565,6 +2566,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 21e7cb9a28..a79b8863e1 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -2192,6 +2192,7 @@ GLIBC_2.3.4 getsourcefilter F GLIBC_2.3.4 longjmp F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F +GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F @@ -2301,6 +2302,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist index 073df9d157..a7117238c4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/librt.abilist @@ -8,7 +8,6 @@ GLIBC_2.3.3 timer_delete F GLIBC_2.3.3 timer_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F -GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_send F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 5487741113..89293145e4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -1447,6 +1447,7 @@ GLIBC_2.17 mprobe F GLIBC_2.17 mprotect F GLIBC_2.17 mq_close F GLIBC_2.17 mq_getattr F +GLIBC_2.17 mq_notify F GLIBC_2.17 mq_setattr F GLIBC_2.17 mrand48 F GLIBC_2.17 mrand48_r F @@ -2600,6 +2601,7 @@ GLIBC_2.34 lio_listio F GLIBC_2.34 lio_listio64 F GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F +GLIBC_2.34 mq_notify F GLIBC_2.34 mq_setattr F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist index 33b825d874..6cab033b12 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/librt.abilist @@ -1,5 +1,4 @@ GLIBC_2.17 __mq_open_2 F -GLIBC_2.17 mq_notify F GLIBC_2.17 mq_open F GLIBC_2.17 mq_receive F GLIBC_2.17 mq_send F </cut>

4 years, 3 months

[ACTIVITY] week ending 11 Jul 2021

by Richard Henderson

[ UM-2 ] * Sent v2 vdso + signal page patch set. * Fix #457 (tb_phys_invalidate_cont) * Fix #187 (arm on s390x) * Sent new rev for i386 fcs:fip patch set. * Sent v3 translator_use_goto_tb patch set. * Sent bswap cleanup. * Sent tcg_constant cleanups: alpha, hppa, openrisc, riscv. r~

4 years, 3 months

[CI-NOTIFY]: TCWG Bisect tcwg_cross/gnu-release-aarch64-check_cross - Build # 27 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *binutils* in CI configuration tcwg_cross/gnu-release-aarch64-check_cross. So far, this commit has regressed CI configurations: - tcwg_cross/gnu-release-aarch64-check_cross Culprit: <cut> commit abe2a28aaa7a2bfd0f3061c72a98eb898976b721 Author: Nick Clifton <nickc(a)redhat.com> Date: Fri Jul 9 16:39:06 2021 +0100 Backportpatch to fix parsing of DWARF fuction and variable tags. PR 27484 bfd * dwarf2.c (scan_unit_for_symbols): Scan twice, once to accumulate function and variable tags and a second time to resolve their attributes. </cut> Results regressed to (for first_bad == abe2a28aaa7a2bfd0f3061c72a98eb898976b721) # reset_artifacts: -10 # build_abe binutils: -8 # build_abe stage1: -7 # build_abe linux: -6 # build_abe glibc: -5 # build_abe stage2: -4 # build_abe qemu: -3 # build_abe dejagnu: 0 # build_abe check_gcc --: 1 # Getting actual results from build directory /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libitm.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libgomp.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libstdc++.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/g++.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/gcc.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/gfortran.sum # /home/tcwg-buildslave/workspace/tcwg_gnu_1/artifacts/build-abe2a28aaa7a2bfd0f3061c72a98eb898976b721/sumfiles/libatomic.sum # Manifest: gcc-compare-results/contrib/testsuite-management/flaky.xfail # Getting actual results from build directory base-artifacts/sumfiles # base-artifacts/sumfiles/libitm.sum # base-artifacts/sumfiles/libgomp.sum # base-artifacts/sumfiles/libstdc++.sum # base-artifacts/sumfiles/g++.sum # base-artifacts/sumfiles/gcc.sum # base-artifacts/sumfiles/gfortran.sum # base-artifacts/sumfiles/libatomic.sum # # SUCCESS: No unexpected failures. from (for last_good == 814d9ecf9b08018aa8ae2cd768ad8628945fd6aa) # reset_artifacts: -10 # build_abe binutils: -8 # build_abe stage1: -7 # build_abe linux: -6 # build_abe glibc: -5 # build_abe stage2: -4 # build_abe qemu: -3 # build_abe dejagnu: 0 # build_abe check_gcc --: 1 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Build top page/logs: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Configuration details: Reproduce builds: <cut> mkdir investigate-binutils-abe2a28aaa7a2bfd0f3061c72a98eb898976b721 cd investigate-binutils-abe2a28aaa7a2bfd0f3061c72a98eb898976b721 git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_gnu-build.sh @@ artifacts/manifests/build-baseline.sh cd binutils # Reproduce first_bad build git checkout --detach abe2a28aaa7a2bfd0f3061c72a98eb898976b721 ../artifacts/test.sh # Reproduce last_good build git checkout --detach 814d9ecf9b08018aa8ae2cd768ad8628945fd6aa ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Build log: https://ci.linaro.org/job/tcwg_cross-bisect-gnu-release-aarch64-check_cross… Full commit (up to 1000 lines): <cut> commit abe2a28aaa7a2bfd0f3061c72a98eb898976b721 Author: Nick Clifton <nickc(a)redhat.com> Date: Fri Jul 9 16:39:06 2021 +0100 Backportpatch to fix parsing of DWARF fuction and variable tags. PR 27484 bfd * dwarf2.c (scan_unit_for_symbols): Scan twice, once to accumulate function and variable tags and a second time to resolve their attributes. --- bfd/ChangeLog | 10 +++++ bfd/dwarf2.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 117 insertions(+), 27 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a8b7415fadc..cd6f3706fe2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2021-07-09 Nick Clifton <nickc(a)redhat.com> + + Backport this patch from the mainline: + 2021-03-02 Nick Clifton <nickc(a)redhat.com> + + PR 27484 + * dwarf2.c (scan_unit_for_symbols): Scan twice, once to accumulate + function and variable tags and a second time to resolve their + attributes. + 2021-05-03 Alan Modra <amodra(a)gmail.com> PR 27755 diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c index 5651696c0f7..02618154a21 100644 --- a/bfd/dwarf2.c +++ b/bfd/dwarf2.c @@ -1484,6 +1484,8 @@ struct funcinfo struct arange arange; /* Where the symbol is defined. */ asection * sec; + /* The offset of the funcinfo from the start of the unit. */ + bfd_uint64_t unit_offset; }; struct lookup_funcinfo @@ -3304,6 +3306,15 @@ read_rangelist (struct comp_unit *unit, struct arange *arange, return read_rnglists (unit, arange, offset); } +static struct funcinfo * +lookup_func_by_offset (bfd_uint64_t offset, struct funcinfo * table) +{ + for (; table != NULL; table = table->prev_func) + if (table->unit_offset == offset) + return table; + return NULL; +} + static struct varinfo * lookup_var_by_offset (bfd_uint64_t offset, struct varinfo * table) { @@ -3317,7 +3328,6 @@ lookup_var_by_offset (bfd_uint64_t offset, struct varinfo * table) return NULL; } - /* DWARF2 Compilation unit functions. */ /* Scan over each die in a comp. unit looking for functions to add @@ -3330,7 +3340,8 @@ scan_unit_for_symbols (struct comp_unit *unit) bfd_byte *info_ptr = unit->first_child_die_ptr; bfd_byte *info_ptr_end = unit->end_ptr; int nesting_level = 0; - struct nest_funcinfo { + struct nest_funcinfo + { struct funcinfo *func; } *nested_funcs; int nested_funcs_size; @@ -3344,16 +3355,16 @@ scan_unit_for_symbols (struct comp_unit *unit) return FALSE; nested_funcs[nesting_level].func = 0; + /* PR 27484: We must scan the DIEs twice. The first time we look for + function and variable tags and accumulate them into their respective + tables. The second time through we process the attributes of the + functions/variables and augment the table entries. */ while (nesting_level >= 0) { unsigned int abbrev_number, bytes_read, i; struct abbrev_info *abbrev; - struct attribute attr; struct funcinfo *func; struct varinfo *var; - bfd_vma low_pc = 0; - bfd_vma high_pc = 0; - bfd_boolean high_pc_relative = FALSE; bfd_uint64_t current_offset; /* PR 17512: file: 9f405d9d. */ @@ -3365,7 +3376,7 @@ scan_unit_for_symbols (struct comp_unit *unit) FALSE, info_ptr_end); info_ptr += bytes_read; - if (! abbrev_number) + if (abbrev_number == 0) { nesting_level--; continue; @@ -3400,6 +3411,7 @@ scan_unit_for_symbols (struct comp_unit *unit) goto fail; func->tag = abbrev->tag; func->prev_func = unit->function_table; + func->unit_offset = current_offset; unit->function_table = func; unit->number_of_functions++; BFD_ASSERT (!unit->cached); @@ -3420,6 +3432,7 @@ scan_unit_for_symbols (struct comp_unit *unit) || abbrev->tag == DW_TAG_member) { size_t amt = sizeof (struct varinfo); + var = (struct varinfo *) bfd_zalloc (abfd, amt); if (var == NULL) goto fail; @@ -3438,6 +3451,89 @@ scan_unit_for_symbols (struct comp_unit *unit) nested_funcs[nesting_level].func = 0; } + for (i = 0; i < abbrev->num_attrs; ++i) + { + struct attribute attr; + + info_ptr = read_attribute (&attr, &abbrev->attrs[i], + unit, info_ptr, info_ptr_end); + if (info_ptr == NULL) + goto fail; + } + + if (abbrev->has_children) + { + nesting_level++; + + if (nesting_level >= nested_funcs_size) + { + struct nest_funcinfo *tmp; + + nested_funcs_size *= 2; + tmp = (struct nest_funcinfo *) + bfd_realloc (nested_funcs, + nested_funcs_size * sizeof (*nested_funcs)); + if (tmp == NULL) + goto fail; + nested_funcs = tmp; + } + nested_funcs[nesting_level].func = 0; + } + } + + /* This is the second pass over the abbrevs. */ + info_ptr = unit->first_child_die_ptr; + nesting_level = 0; + + while (nesting_level >= 0) + { + unsigned int abbrev_number, bytes_read, i; + struct abbrev_info *abbrev; + struct attribute attr; + struct funcinfo *func; + struct varinfo *var; + bfd_vma low_pc = 0; + bfd_vma high_pc = 0; + bfd_boolean high_pc_relative = FALSE; + bfd_uint64_t current_offset; + + /* PR 17512: file: 9f405d9d. */ + if (info_ptr >= info_ptr_end) + goto fail; + + current_offset = info_ptr - unit->info_ptr_unit; + abbrev_number = _bfd_safe_read_leb128 (abfd, info_ptr, &bytes_read, + FALSE, info_ptr_end); + info_ptr += bytes_read; + + if (! abbrev_number) + { + nesting_level--; + continue; + } + + abbrev = lookup_abbrev (abbrev_number, unit->abbrevs); + /* This should have been handled above. */ + BFD_ASSERT (abbrev != NULL); + + func = NULL; + var = NULL; + if (abbrev->tag == DW_TAG_subprogram + || abbrev->tag == DW_TAG_entry_point + || abbrev->tag == DW_TAG_inlined_subroutine) + { + func = lookup_func_by_offset (current_offset, unit->function_table); + if (func == NULL) + goto fail; + } + else if (abbrev->tag == DW_TAG_variable + || abbrev->tag == DW_TAG_member) + { + var = lookup_var_by_offset (current_offset, unit->variable_table); + if (var == NULL) + goto fail; + } + for (i = 0; i < abbrev->num_attrs; ++i) { info_ptr = read_attribute (&attr, &abbrev->attrs[i], @@ -3532,7 +3628,7 @@ scan_unit_for_symbols (struct comp_unit *unit) { _bfd_error_handler (_("DWARF error: could not find " "variable specification " - "at offset %lx"), + "at offset 0x%lx"), (unsigned long) attr.u.val); break; } @@ -3604,6 +3700,9 @@ scan_unit_for_symbols (struct comp_unit *unit) } } + if (abbrev->has_children) + nesting_level++; + if (high_pc_relative) high_pc += low_pc; @@ -3612,25 +3711,6 @@ scan_unit_for_symbols (struct comp_unit *unit) if (!arange_add (unit, &func->arange, low_pc, high_pc)) goto fail; } - - if (abbrev->has_children) - { - nesting_level++; - - if (nesting_level >= nested_funcs_size) - { - struct nest_funcinfo *tmp; - - nested_funcs_size *= 2; - tmp = (struct nest_funcinfo *) - bfd_realloc (nested_funcs, - nested_funcs_size * sizeof (*nested_funcs)); - if (tmp == NULL) - goto fail; - nested_funcs = tmp; - } - nested_funcs[nesting_level].func = 0; - } } free (nested_funcs); </cut>

4 years, 3 months

[ACTIVITY] report week ending 9 Jul

by Peter Maydell

Progress: * UM-2 [QEMU upstream maintainership] + Code review: - RTH's translator_use_goto_tb() series - Shashi's v5 ITS series + Arm pullreq * QEMU-406 [QEMU support for MVE (M-profile Vector Extension; Helium)] + Good progress with implementing more insns: VMULL poly, VIDUP, VIWDUP, VDDUP, VDWDUP, VCMP, VPT, VPSEL, VMLAS, VSHL T2, VRSHL T2, VQSHL T2, VQRSHL T2, VMAXV, VMINV, VMAXAV, VMINAV, VABAV, VMOVN, VQMOVUN, VQMOVN, VMLADAV, VMLSDAV, VMLA, VQDMLAH, VQRDMLAH, VQDMLASH, VQRDMLASH, VQABS, VQNEG, VMAXA, VMINA, VMOV-to-2gp, VMOV-from-2gp, VPNOT + Remaining is mostly floating point, and some loads and stores + Progress: 161/210 (76%) thanks -- PMM

4 years, 3 months

[ACTIVITY] week ending Jul. 11 2021

by Alex Bennée

QEMU Upstream Work ([UM-2]) =========================== - spent some time pulling together various maintainer trees for final 6.1 PRs - hopefully [this is the last iteration before Monday] - posted [PATCH for 6.1 v2 0/5] custom device configs Message-Id: <20210707131744.26027-1-alex.bennee(a)linaro.org> - chips away at the mega ARM re-factor patch set - posted [PATCH v1 0/2] some device emulation documentation cleanup Message-Id: <20210707184549.24436-1-alex.bennee(a)linaro.org> [UM-2] <https://projects.linaro.org/browse/UM-2> [this is the last iteration before Monday] <https://patchew.org/QEMU/20210709143005.1554-1-alex.bennee@linaro.org/> Other ===== - ARM CCA Announcement Event - Rust Training - Bunch of meetings with various members talking about future for QEMU - now the JIRA is migrated there are some things to add - wrote and abstract for KVM forum and [experimented with some visualisation] [experimented with some visualisation] <https://mastodon.org.uk/web/statuses/106535665831189241> Announced QEMU 6.1 on Linux Open Discussion Message-Id: <87zgv0tt7a.fsf(a)linaro.org> Completed Reviews [5/5] ======================= [PATCH v6 0/4] GitLab Custom Runners and Jobs (was: QEMU Gating CI) Message-Id: <20210608031425.833536-1-crosa(a)redhat.com> [PATCH v4 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Message-Id: <20210623142245.307776-1-berrange(a)redhat.com> [PATCH v4 0/5] plugins: New TCG plugin for cache modelling Message-Id: <20210623125458.450462-1-ma.mandourr(a)gmail.com> [PATCH v3 0/2] execlog TCG plugin to log instructions Message-Id: <20210702081307.1653644-1-erdnaxe(a)crans.org> [PATCH 0/3] ci: use cirrus-run to utilize Cirrus CI from GitLab CI Message-Id: <20210625172211.451010-1-berrange(a)redhat.com> Absences ======== Current Review Queue ==================== TODO [PATCH v5 00/10] GICv3 LPI and ITS feature implementation Message-Id: <20210630153156.9421-1-shashi.mallela(a)linaro.org> =========================================================================================================================== TODO [PATCH 00/17] tcg: breakpoint reorg Message-Id: <20210701152537.3330420-1-richard.henderson(a)linaro.org> =========================================================================================================== TODO [PATCH v2 00/28] accel/tcg: Introduce translator_use_goto_tb Message-Id: <20210630183226.3290849-1-richard.henderson(a)linaro.org> ==================================================================================================================================== TODO [PATCH v3 00/29] tcg: bswap improvements Message-Id: <20210626063631.2411938-1-richard.henderson(a)linaro.org> ================================================================================================================ -- Alex Bennée

4 years, 3 months

[CI-NOTIFY]: TCWG Bisect tcwg_bmk_tk1/llvm-master-arm-spec2k6-Oz_LTO - Build # 10 - Successful!

by ci_notify＠linaro.org

Successfully identified regression in *llvm* in CI configuration tcwg_bmk_llvm_tk1/llvm-master-arm-spec2k6-Oz_LTO. So far, this commit has regressed CI configurations: - tcwg_bmk_llvm_tk1/llvm-master-arm-spec2k6-Oz_LTO Culprit: <cut> commit 51d334a845a082338735b0fdfc620a4b15fa26fe Author: Max Kazantsev <mkazantsev(a)azul.com> Date: Thu May 27 13:20:57 2021 +0700 [NFCI] Lazily evaluate SCEVs of PHIs Eager evaluation has cost of compile time. Only query them if they are required for proving predicates. </cut> Results regressed to (for first_bad == 51d334a845a082338735b0fdfc620a4b15fa26fe) # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer: -8 # build_abe linux: -7 # build_abe glibc: -6 # build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer: -5 # build_llvm true: -3 # true: 0 # benchmark -Oz_LTO_mthumb -- artifacts/build-51d334a845a082338735b0fdfc620a4b15fa26fe/results_id: 1 # 450.soplex,soplex_base.default regressed by 509909 # 473.astar,astar_base.default regressed by 4232401 # 453.povray,povray_base.default regressed by 166915 # 403.gcc,gcc_base.default regressed by 50755 from (for last_good == 59d938e649e62db0cef4903d495e838fbc6a6eb8) # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer: -8 # build_abe linux: -7 # build_abe glibc: -6 # build_abe stage2 -- --set gcc_override_configure=--with-mode=thumb --set gcc_override_configure=--disable-libsanitizer: -5 # build_llvm true: -3 # true: 0 # benchmark -Oz_LTO_mthumb -- artifacts/build-59d938e649e62db0cef4903d495e838fbc6a6eb8/results_id: 1 Artifacts of last_good build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Results ID of last_good: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-master-arm-spec2k6-Oz_LTO/1235 Artifacts of first_bad build: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Results ID of first_bad: tk1_32/tcwg_bmk_llvm_tk1/bisect-llvm-master-arm-spec2k6-Oz_LTO/1241 Build top page/logs: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Configuration details: Reproduce builds: <cut> mkdir investigate-llvm-51d334a845a082338735b0fdfc620a4b15fa26fe cd investigate-llvm-51d334a845a082338735b0fdfc620a4b15fa26fe git clone https://git.linaro.org/toolchain/jenkins-scripts mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_bmk-build.sh @@ artifacts/manifests/build-baseline.sh cd llvm # Reproduce first_bad build git checkout --detach 51d334a845a082338735b0fdfc620a4b15fa26fe ../artifacts/test.sh # Reproduce last_good build git checkout --detach 59d938e649e62db0cef4903d495e838fbc6a6eb8 ../artifacts/test.sh cd .. </cut> History of pending regressions and results: https://git.linaro.org/toolchain/ci/base-artifacts.git/log/?h=linaro-local/… Artifacts: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Build log: https://ci.linaro.org/job/tcwg_bmk_ci_llvm-bisect-tcwg_bmk_tk1-llvm-master-… Full commit (up to 1000 lines): <cut> commit 51d334a845a082338735b0fdfc620a4b15fa26fe Author: Max Kazantsev <mkazantsev(a)azul.com> Date: Thu May 27 13:20:57 2021 +0700 [NFCI] Lazily evaluate SCEVs of PHIs Eager evaluation has cost of compile time. Only query them if they are required for proving predicates. --- llvm/lib/Transforms/Scalar/LoopDeletion.cpp | 115 +++++++++++++++++----------- 1 file changed, 72 insertions(+), 43 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/LoopDeletion.cpp b/llvm/lib/Transforms/Scalar/LoopDeletion.cpp index cd2a3fc48e3b..ed6b078fcf8e 100644 --- a/llvm/lib/Transforms/Scalar/LoopDeletion.cpp +++ b/llvm/lib/Transforms/Scalar/LoopDeletion.cpp @@ -136,30 +136,88 @@ static bool isLoopNeverExecuted(Loop *L) { return true; } +BasicBlock * +getSolePredecessorOnFirstIteration(BasicBlock *BB, Loop *L, + const DenseSet<BasicBlockEdge> &LiveEdges) { + if (BB == L->getHeader()) + return L->getLoopPredecessor(); + BasicBlock *OnlyPred = nullptr; + for (auto *Pred : predecessors(BB)) + if (OnlyPred != Pred && LiveEdges.count({ Pred, BB })) { + // 2 live preds. + if (OnlyPred) + return nullptr; + OnlyPred = Pred; + } + + assert(OnlyPred && "No live predecessors?"); + return OnlyPred; +} + +// Forward declaration. +static const SCEV * +getSCEVOnFirstIteration(Value *V, Loop *L, DominatorTree &DT, + ScalarEvolution &SE, + DenseMap<Value *, const SCEV *> &FirstIterSCEV, + const DenseSet<BasicBlockEdge> &LiveEdges); + static const SCEV * -getSCEVOnFirstIteration(Value *V, Loop *L, ScalarEvolution &SE, - DenseMap<Value *, const SCEV *> &FirstIterSCEV) { +getPHISCEVOnFirstIteration(PHINode *PN, Loop *L, DominatorTree &DT, + ScalarEvolution &SE, + DenseMap<Value *, const SCEV *> &FirstIterSCEV, + const DenseSet<BasicBlockEdge> &LiveEdges) { + auto *BB = PN->getParent(); + if (!L->contains(PN)) + return SE.getSCEV(PN); + // If this block has only one live pred, map its phis onto their SCEVs. + // Check if there is only one predecessor on 1st iteration. Note that because + // we iterate in RPOT, we have already visited all its (non-latch) + // predecessors. + auto *OnlyPred = getSolePredecessorOnFirstIteration(BB, L, LiveEdges); + if (!OnlyPred) + return SE.getSCEV(PN); + auto *Incoming = PN->getIncomingValueForBlock(OnlyPred); + if (DT.dominates(Incoming, BB->getTerminator())) + return getSCEVOnFirstIteration(Incoming, L, DT, SE, FirstIterSCEV, + LiveEdges); + return SE.getSCEV(PN); +} + +static const SCEV * +getSCEVOnFirstIteration(Value *V, Loop *L, DominatorTree &DT, + ScalarEvolution &SE, + DenseMap<Value *, const SCEV *> &FirstIterSCEV, + const DenseSet<BasicBlockEdge> &LiveEdges) { // Fist, check in cache. auto Existing = FirstIterSCEV.find(V); if (Existing != FirstIterSCEV.end()) return Existing->second; + const SCEV *S = nullptr; // TODO: Once ScalarEvolution supports getValueOnNthIteration for anything // else but AddRecs, it's a good use case for it. So far, just consider some // simple cases, like arithmetic operations. Value *LHS, *RHS; using namespace PatternMatch; - if (match(V, m_Add(m_Value(LHS), m_Value(RHS)))) { - const SCEV *LHSS = getSCEVOnFirstIteration(LHS, L, SE, FirstIterSCEV); - const SCEV *RHSS = getSCEVOnFirstIteration(RHS, L, SE, FirstIterSCEV); + if (auto *PN = dyn_cast<PHINode>(V)) { + S = getPHISCEVOnFirstIteration(PN, L, DT, SE, FirstIterSCEV, LiveEdges); + } else if (match(V, m_Add(m_Value(LHS), m_Value(RHS)))) { + const SCEV *LHSS = + getSCEVOnFirstIteration(LHS, L, DT, SE, FirstIterSCEV, LiveEdges); + const SCEV *RHSS = + getSCEVOnFirstIteration(RHS, L, DT, SE, FirstIterSCEV, LiveEdges); S = SE.getAddExpr(LHSS, RHSS); } else if (match(V, m_Sub(m_Value(LHS), m_Value(RHS)))) { - const SCEV *LHSS = getSCEVOnFirstIteration(LHS, L, SE, FirstIterSCEV); - const SCEV *RHSS = getSCEVOnFirstIteration(RHS, L, SE, FirstIterSCEV); + const SCEV *LHSS = + getSCEVOnFirstIteration(LHS, L, DT, SE, FirstIterSCEV, LiveEdges); + const SCEV *RHSS = + getSCEVOnFirstIteration(RHS, L, DT, SE, FirstIterSCEV, LiveEdges); S = SE.getMinusSCEV(LHSS, RHSS); } else if (match(V, m_Mul(m_Value(LHS), m_Value(RHS)))) { - const SCEV *LHSS = getSCEVOnFirstIteration(LHS, L, SE, FirstIterSCEV); - const SCEV *RHSS = getSCEVOnFirstIteration(RHS, L, SE, FirstIterSCEV); + const SCEV *LHSS = + getSCEVOnFirstIteration(LHS, L, DT, SE, FirstIterSCEV, LiveEdges); + const SCEV *RHSS = + getSCEVOnFirstIteration(RHS, L, DT, SE, FirstIterSCEV, LiveEdges); S = SE.getMulExpr(LHSS, RHSS); } else S = SE.getSCEV(V); @@ -185,7 +243,7 @@ static bool canProveExitOnFirstIteration(Loop *L, DominatorTree &DT, SmallPtrSet<BasicBlock *, 4> LiveBlocks; // Edges that are reachable on the 1st iteration. DenseSet<BasicBlockEdge> LiveEdges; - LiveBlocks.insert(L->getHeader()); + LiveBlocks.insert(Header); auto MarkLiveEdge = [&](BasicBlock *From, BasicBlock *To) { assert(LiveBlocks.count(From) && "Must be live!"); @@ -198,24 +256,6 @@ static bool canProveExitOnFirstIteration(Loop *L, DominatorTree &DT, MarkLiveEdge(BB, Succ); }; - // Check if there is only one predecessor on 1st iteration. Note that because - // we iterate in RPOT, we have already visited all its (non-latch) - // predecessors. - auto GetSolePredecessorOnFirstIteration = [&](BasicBlock * BB)->BasicBlock * { - if (BB == Header) - return L->getLoopPredecessor(); - BasicBlock *OnlyPred = nullptr; - for (auto *Pred : predecessors(BB)) - if (OnlyPred != Pred && LiveEdges.count({ Pred, BB })) { - // 2 live preds. - if (OnlyPred) - return nullptr; - OnlyPred = Pred; - } - - assert(OnlyPred && "No live predecessors?"); - return OnlyPred; - }; DenseMap<Value *, const SCEV *> FirstIterSCEV; SmallPtrSet<BasicBlock *, 4> Visited; @@ -250,19 +290,6 @@ static bool canProveExitOnFirstIteration(Loop *L, DominatorTree &DT, if (!Visited.count(Pred)) return false; - // If this block has only one live pred, map its phis onto their SCEVs. - if (auto *OnlyPred = GetSolePredecessorOnFirstIteration(BB)) - for (auto &PN : BB->phis()) { - if (!SE.isSCEVable(PN.getType())) - continue; - auto *Incoming = PN.getIncomingValueForBlock(OnlyPred); - if (DT.dominates(Incoming, BB->getTerminator())) { - const SCEV *IncSCEV = - getSCEVOnFirstIteration(Incoming, L, SE, FirstIterSCEV); - FirstIterSCEV[&PN] = IncSCEV; - } - } - using namespace PatternMatch; ICmpInst::Predicate Pred; Value *LHS, *RHS; @@ -281,8 +308,10 @@ static bool canProveExitOnFirstIteration(Loop *L, DominatorTree &DT, } // Can we prove constant true or false for this condition? - const SCEV *LHSS = getSCEVOnFirstIteration(LHS, L, SE, FirstIterSCEV); - const SCEV *RHSS = getSCEVOnFirstIteration(RHS, L, SE, FirstIterSCEV); + const SCEV *LHSS = + getSCEVOnFirstIteration(LHS, L, DT, SE, FirstIterSCEV, LiveEdges); + const SCEV *RHSS = + getSCEVOnFirstIteration(RHS, L, DT, SE, FirstIterSCEV, LiveEdges); // Only query for liveness of in-loop edge if another successor is also // in-loop. // TODO: isKnownPredicateAt is more powerful, but it's too compile time </cut>

4 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-toolchain