commit: 75e80ce24ee1b7a17c13e9e513cab5ba81635262 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 10 17:25:14 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 10 17:25:14 2024 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=75e80ce2
15.0.0: backport two fixes A severe miscompilation and a severe ICE fix. Bug: https://gcc.gnu.org/PR115387 Bug: https://gcc.gnu.org/PR115395 Signed-off-by: Sam James <sam <AT> gentoo.org> 15.0.0/gentoo/77_all_PR115387.patch | 206 ++++++++++++++++++++++++++++++++++++ 15.0.0/gentoo/78_all_PR115395.patch | 107 +++++++++++++++++++ 15.0.0/gentoo/README.history | 5 + 3 files changed, 318 insertions(+) diff --git a/15.0.0/gentoo/77_all_PR115387.patch b/15.0.0/gentoo/77_all_PR115387.patch new file mode 100644 index 0000000..bf143e7 --- /dev/null +++ b/15.0.0/gentoo/77_all_PR115387.patch @@ -0,0 +1,206 @@ +https://gcc.gnu.org/PR115387 +https://inbox.sourceware.org/gcc-patches/[email protected]/T/#t + +From mboxrd@z Thu Jan 1 00:00:00 1970 +Return-Path: <[email protected]> +Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) + by sourceware.org (Postfix) with ESMTPS id 48A883858CDB + for <[email protected]>; Mon, 10 Jun 2024 14:49:07 +0000 (GMT) +DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 48A883858CDB +Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com +Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com +ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 48A883858CDB +Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=198.175.65.14 +ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718030949; cv=none; + b=sYMAFxaXXHzkHsYoFI0HFGXWzujiQRXs1KA4PpQKerabnFz185hAazNZgv5HRn33NHy30a6CaFSGdNqMzI5rJ/uWP0t/IVSZPws+DkO9GCBPkgQLIHvRRf5J+uf7usxHf+quk0tjfzrDkHctT7riGqQjzSEAkBTwrKXd7X9aQ9k= +ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; + t=1718030949; c=relaxed/simple; + bh=p/hDLfesLAxds7UkloKeUvZGINWc0ydc/cnr4ptMBSU=; + h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=GtE3ODQcVtLdsf2+edm43ZWyfgTSrruAj3RQ1zIcTMeifKot7fY59t2YIAFrSyx/vKLMuPwocIQ8p3VmYLj4DB2f8ybXvEhBcx2pxlh5GNVmPxjGtJsnrv6p7oMG9CA6X/bns8vlMhr2CgwzHRba7bItkwFWjKkI8gbJz3v9zeo= +ARC-Authentication-Results: i=1; server2.sourceware.org +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; + d=intel.com; [email protected]; q=dns/txt; s=Intel; + t=1718030948; x=1749566948; + h=from:to:cc:subject:date:message-id:mime-version: + content-transfer-encoding; + bh=p/hDLfesLAxds7UkloKeUvZGINWc0ydc/cnr4ptMBSU=; + b=biitKQIpbkCUKRo31CQVWz5tQ3QP6AsTulnDi3LB7cDTMJflku4VDWDx + Dnu97Pvn/2HzgfrZyN+1kVfGvLnehrErvG2qw3kZ2PGu0AiKrtnTRj0ED + UdyWa4+MQF5nj34UK92MRcA1Ovou3O89YdQ11EmVuL1KynSTtKgwo/d/9 + JsYn3MkWZP6NjVgZteOu5xBZF+J3NxK61azjaUgP8LIxo1bmEKUMBgo0f + p0gXtZXjZkxtpcqzr++CtB6e4fKUHQK8z/FjOzaHvwIzmxdoEcptRGtl9 + v+2kXKMcvMQGZZlsBfFIewmNKjK6qUYGrDKl1wltMZMkeijuudmObyhaq + A==; +X-CSE-ConnectionGUID: JaJ1NR5jSimBRrZvjuM+Lw== +X-CSE-MsgGUID: Q6rSZfGaQfOHvXT9LPs02g== +X-IronPort-AV: E=McAfee;i="6600,9927,11099"; a="18526139" +X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; + d="scan'208";a="18526139" +Received: from orviesa002.jf.intel.com ([10.64.159.142]) + by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 07:49:07 -0700 +X-CSE-ConnectionGUID: +SJ6B8QPQfWwhjgjPJujEw== +X-CSE-MsgGUID: eHhYmO22SKyPWaJe7LW77Q== +X-ExtLoop1: 1 +X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; + d="scan'208";a="69872329" +Received: from shvmail03.sh.intel.com ([10.239.245.20]) + by orviesa002.jf.intel.com with ESMTP; 10 Jun 2024 07:49:04 -0700 +Received: from pli-ubuntu.sh.intel.com (pli-ubuntu.sh.intel.com [10.239.159.47]) + by shvmail03.sh.intel.com (Postfix) with ESMTP id E43A71007C1D; + Mon, 10 Jun 2024 22:49:02 +0800 (CST) +From: [email protected] +To: [email protected] +Cc: [email protected], + [email protected], + [email protected], + Pan Li <[email protected]> +Subject: [PATCH v1] Widening-Mul: Fix one ICE of gcall insertion for PHI match +Date: Mon, 10 Jun 2024 22:49:01 +0800 +Message-Id: <[email protected]> +X-Mailer: git-send-email 2.34.1 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 +X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org +List-Id: <gcc-patches.gcc.gnu.org> + +From: Pan Li <[email protected]> + +When enabled the PHI handing for COND_EXPR, we need to insert the gcall +to replace the PHI node. Unfortunately, I made a mistake that insert +the gcall to before the last stmt of the bb. See below gimple, the PHI +is located at no.1 but we insert the gcall (aka no.9) to the end of +the bb. Then the use of _9 in no.2 will have no def and will trigger +ICE when verify_ssa. + + 1. # _9 = PHI <_3(4), 18446744073709551615(3)> // The PHI node to be deleted. + 2. prephitmp_36 = (char *) _9; + 3. buf.write_base = string_13(D); + 4. buf.write_ptr = string_13(D); + 5. buf.write_end = prephitmp_36; + 6. buf.written = 0; + 7. buf.mode = 3; + 8. _7 = buf.write_end; + 9. _9 = .SAT_ADD (string.0_2, maxlen_15(D)); // Insert gcall to last bb by mistake + +This patch would like to insert the gcall to before the start of the bb +stmt. To ensure the possible use of PHI_result will have a def exists. +After this patch the above gimple will be: + + 0. _9 = .SAT_ADD (string.0_2, maxlen_15(D)); // Insert gcall to start bb by mistake + 1. # _9 = PHI <_3(4), 18446744073709551615(3)> // The PHI node to be deleted. + 2. prephitmp_36 = (char *) _9; + 3. buf.write_base = string_13(D); + 4. buf.write_ptr = string_13(D); + 5. buf.write_end = prephitmp_36; + 6. buf.written = 0; + 7. buf.mode = 3; + 8. _7 = buf.write_end; + +The below test suites are passed for this patch: +* The rv64gcv fully regression test with newlib. +* The rv64gcv build with glibc. +* The x86 regression test with newlib. +* The x86 bootstrap test with newlib. + + PR target/115387 + +gcc/ChangeLog: + + * tree-ssa-math-opts.cc (math_opts_dom_walker::after_dom_children): Take + the gsi of start_bb instead of last_bb. + +gcc/testsuite/ChangeLog: + + * gcc.target/riscv/pr115387-1.c: New test. + * gcc.target/riscv/pr115387-2.c: New test. + +Signed-off-by: Pan Li <[email protected]> +--- + gcc/testsuite/gcc.target/riscv/pr115387-1.c | 35 +++++++++++++++++++++ + gcc/testsuite/gcc.target/riscv/pr115387-2.c | 18 +++++++++++ + gcc/tree-ssa-math-opts.cc | 2 +- + 3 files changed, 54 insertions(+), 1 deletion(-) + create mode 100644 gcc/testsuite/gcc.target/riscv/pr115387-1.c + create mode 100644 gcc/testsuite/gcc.target/riscv/pr115387-2.c + +diff --git a/gcc/testsuite/gcc.target/riscv/pr115387-1.c b/gcc/testsuite/gcc.target/riscv/pr115387-1.c +new file mode 100644 +index 00000000000..a1c926977c4 +--- /dev/null ++++ b/gcc/testsuite/gcc.target/riscv/pr115387-1.c +@@ -0,0 +1,35 @@ ++/* Test there is no ICE when compile. */ ++/* { dg-do compile } */ ++/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */ ++ ++#define PRINTF_CHK 0x34 ++ ++typedef unsigned long uintptr_t; ++ ++struct __printf_buffer { ++ char *write_ptr; ++ int status; ++}; ++ ++extern void __printf_buffer_init_end (struct __printf_buffer *, char *, char *); ++ ++void ++test (char *string, unsigned long maxlen, unsigned mode_flags) ++{ ++ struct __printf_buffer buf; ++ ++ if ((mode_flags & PRINTF_CHK) != 0) ++ { ++ string[0] = '\0'; ++ uintptr_t end; ++ ++ if (__builtin_add_overflow ((uintptr_t) string, maxlen, &end)) ++ end = -1; ++ ++ __printf_buffer_init_end (&buf, string, (char *) end); ++ } ++ else ++ __printf_buffer_init_end (&buf, string, (char *) ~(uintptr_t) 0); ++ ++ *buf.write_ptr = '\0'; ++} +diff --git a/gcc/testsuite/gcc.target/riscv/pr115387-2.c b/gcc/testsuite/gcc.target/riscv/pr115387-2.c +new file mode 100644 +index 00000000000..7183bf18dfd +--- /dev/null ++++ b/gcc/testsuite/gcc.target/riscv/pr115387-2.c +@@ -0,0 +1,18 @@ ++/* Test there is no ICE when compile. */ ++/* { dg-do compile } */ ++/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */ ++ ++#include <stddef.h> ++#include <stdint-gcc.h> ++ ++char * ++test (char *string, size_t maxlen) ++{ ++ string[0] = '\0'; ++ uintptr_t end; ++ ++ if (__builtin_add_overflow ((uintptr_t) string, maxlen, &end)) ++ end = -1; ++ ++ return (char *) end; ++} +diff --git a/gcc/tree-ssa-math-opts.cc b/gcc/tree-ssa-math-opts.cc +index 173b0366f5e..fbb8e0ea306 100644 +--- a/gcc/tree-ssa-math-opts.cc ++++ b/gcc/tree-ssa-math-opts.cc +@@ -6102,7 +6102,7 @@ math_opts_dom_walker::after_dom_children (basic_block bb) + for (gphi_iterator psi = gsi_start_phis (bb); !gsi_end_p (psi); + gsi_next (&psi)) + { +- gimple_stmt_iterator gsi = gsi_last_bb (bb); ++ gimple_stmt_iterator gsi = gsi_start_bb (bb); + match_unsigned_saturation_add (&gsi, psi.phi ()); + } + +-- +2.34.1 diff --git a/15.0.0/gentoo/78_all_PR115395.patch b/15.0.0/gentoo/78_all_PR115395.patch new file mode 100644 index 0000000..d98c043 --- /dev/null +++ b/15.0.0/gentoo/78_all_PR115395.patch @@ -0,0 +1,107 @@ +https://gcc.gnu.org/PR115395 + +From 4ed9c5df7efeb98e190573cca42a4fd40666c45f Mon Sep 17 00:00:00 2001 +From: Richard Biener <[email protected]> +Date: Mon, 10 Jun 2024 10:12:52 +0200 +Subject: [PATCH] tree-optimization/115395 - wrong-code with SLP reduction in + epilog + +When we continue a non-SLP reduction from the main loop in the +epilog with a SLP reduction we currently fail to handle an +adjustment by the initial value because that's not a thing with SLP. +As long as we have the possibility to mix SLP and non-SLP we have +to handle it though. + + PR tree-optimization/115395 + * tree-vect-loop.cc (vect_create_epilog_for_reduction): + Handle STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT also for SLP + reductions of group_size one. + + * gcc.dg/vect/pr115395.c: New testcase. +--- + gcc/testsuite/gcc.dg/vect/pr115395.c | 27 +++++++++++++++++++++++++++ + gcc/tree-vect-loop.cc | 27 ++++++++------------------- + 2 files changed, 35 insertions(+), 19 deletions(-) + create mode 100644 gcc/testsuite/gcc.dg/vect/pr115395.c + +diff --git a/gcc/testsuite/gcc.dg/vect/pr115395.c b/gcc/testsuite/gcc.dg/vect/pr115395.c +new file mode 100644 +index 00000000000..cd1cee9f3df +--- /dev/null ++++ b/gcc/testsuite/gcc.dg/vect/pr115395.c +@@ -0,0 +1,27 @@ ++/* { dg-additional-options "-mavx2" { target avx2_runtime } } */ ++ ++#include "tree-vect.h" ++ ++struct { ++ long header_size; ++ long start_offset; ++ long end_offset; ++} myrar_dbo[5] = {{0, 87, 6980}, {0, 7087, 13980}, {0, 14087, 0}}; ++ ++int i; ++long offset; ++ ++int main() ++{ ++ check_vect (); ++ ++ offset += myrar_dbo[0].start_offset; ++ while (i < 2) { ++ i++; ++ offset += myrar_dbo[i].start_offset - myrar_dbo[i - 1].end_offset; ++ } ++ if (offset != 301) ++ abort(); ++ ++ return 0; ++} +diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc +index 028692614bb..c471f1564a7 100644 +--- a/gcc/tree-vect-loop.cc ++++ b/gcc/tree-vect-loop.cc +@@ -6030,25 +6030,14 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, + + tree induc_val = NULL_TREE; + tree adjustment_def = NULL; +- if (slp_node) +- { +- /* Optimize: for induction condition reduction, if we can't use zero +- for induc_val, use initial_def. */ +- if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION) +- induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info); +- /* ??? Coverage for 'else' isn't clear. */ +- } ++ /* Optimize: for induction condition reduction, if we can't use zero ++ for induc_val, use initial_def. */ ++ if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION) ++ induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info); ++ else if (double_reduc) ++ ; + else +- { +- /* Optimize: for induction condition reduction, if we can't use zero +- for induc_val, use initial_def. */ +- if (STMT_VINFO_REDUC_TYPE (reduc_info) == INTEGER_INDUC_COND_REDUCTION) +- induc_val = STMT_VINFO_VEC_INDUC_COND_INITIAL_VAL (reduc_info); +- else if (double_reduc) +- ; +- else +- adjustment_def = STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_info); +- } ++ adjustment_def = STMT_VINFO_REDUC_EPILOGUE_ADJUSTMENT (reduc_info); + + stmt_vec_info single_live_out_stmt[] = { stmt_info }; + array_slice<const stmt_vec_info> live_out_stmts = single_live_out_stmt; +@@ -6873,7 +6862,7 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, + + if (adjustment_def) + { +- gcc_assert (!slp_reduc); ++ gcc_assert (!slp_reduc || group_size == 1); + gimple_seq stmts = NULL; + if (double_reduc) + { +-- +2.43.0 diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history index b2b3de3..1573b55 100644 --- a/15.0.0/gentoo/README.history +++ b/15.0.0/gentoo/README.history @@ -1,3 +1,8 @@ +3 10 June 2024 + + + 77_all_PR115387.patch + + 78_all_PR115395.patch + 2 10 June 2024 - 76_all_ppc_PR112868-no-checking-many.patch
