From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by sourceware.org (Postfix) with ESMTPS id C83F93858D20 for ; Wed, 31 May 2023 01:35:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C83F93858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685496941; x=1717032941; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9GXMN4a9wEjZWuXqwl7l4Vz0Lq8nBO98NJy2Mt5qj2c=; b=HSV1AepwE782TMMxw8cPibFjvwVLbe55xr/3JLf3si6xDAwHVTPmVBXa QMpJLDMLjeLW9rlxFXxJee46qJx1kQDaRiC8wrP6HMA8Zg32nbEDRC6P0 DFpWghFJ6h6x24NlKxLgXwSSqN6z8f/6pljpNnn6HiolaywMkihdBdeke 1iZ+f19TqlVaSsiVbf/W3ktJqtMoNiKkCkKp4YtJppbTS/hp0/HB4f55M +SzBh9CQvHv6QV87r0ErV5b3Cbs3TmkvnAlniIr6TgGdUnB65AAeqrKj+ xvuvLQTb5dsYqm7pQXa/jOgKuTRE0uptQTcvZ3QzeolnkOsTVYa1H2kr1 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="420862172" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="420862172" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2023 18:35:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10726"; a="851025237" X-IronPort-AV: E=Sophos;i="6.00,205,1681196400"; d="scan'208";a="851025237" Received: from scymds03.sc.intel.com ([10.148.94.166]) by fmsmga001.fm.intel.com with ESMTP; 30 May 2023 18:35:27 -0700 Received: from shgcc101.sh.intel.com (shgcc101.sh.intel.com [10.239.85.97]) by scymds03.sc.intel.com (Postfix) with ESMTP id 1F64464; Tue, 30 May 2023 18:35:26 -0700 (PDT) From: "Cui, Lili" To: gcc-patches@gcc.gnu.org Cc: richard.guenther@gmail.com Subject: [PATCH] Fix ICE in rewrite_expr_tree_parallel Date: Wed, 31 May 2023 01:35:25 +0000 Message-Id: <20230531013525.4133283-1-lili.cui@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 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: Hi, This patch is to fix ICE in rewrite_expr_tree_parallel. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110038 Bootstrapped and regtested. Ok for trunk? Regards Lili. 1. Limit the value of tree-reassoc-width to IntegerRange(0, 256). 2. Add width limit in rewrite_expr_tree_parallel. gcc/ChangeLog: PR tree-optimization/110038 * params.opt: Add a limit on tree-reassoc-width. * tree-ssa-reassoc.cc (rewrite_expr_tree_parallel): Add width limit. gcc/testsuite/ChangeLog: PR tree-optimization/110038 * gcc.dg/pr110038.c: New test. --- gcc/params.opt | 2 +- gcc/testsuite/gcc.dg/pr110038.c | 10 ++++++++++ gcc/tree-ssa-reassoc.cc | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr110038.c diff --git a/gcc/params.opt b/gcc/params.opt index 66f1c99036a..70cfb495e3a 100644 --- a/gcc/params.opt +++ b/gcc/params.opt @@ -1091,7 +1091,7 @@ Common Joined UInteger Var(param_tracer_min_branch_ratio) Init(10) IntegerRange( Stop reverse growth if the reverse probability of best edge is less than this threshold (in percent). -param=tree-reassoc-width= -Common Joined UInteger Var(param_tree_reassoc_width) Param Optimization +Common Joined UInteger Var(param_tree_reassoc_width) IntegerRange(0, 256) Param Optimization Set the maximum number of instructions executed in parallel in reassociated tree. If 0, use the target dependent heuristic. -param=tsan-distinguish-volatile= diff --git a/gcc/testsuite/gcc.dg/pr110038.c b/gcc/testsuite/gcc.dg/pr110038.c new file mode 100644 index 00000000000..0f578b182ca --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr110038.c @@ -0,0 +1,10 @@ +/* { dg-do compile } */ +/* { dg-options "-O --param=tree-reassoc-width=256" } */ + +unsigned a, b; + +void +foo (unsigned c) +{ + a += b + c + 1; +} diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc index ad2f528ff07..f8055d59d57 100644 --- a/gcc/tree-ssa-reassoc.cc +++ b/gcc/tree-ssa-reassoc.cc @@ -5510,6 +5510,9 @@ rewrite_expr_tree_parallel (gassign *stmt, int width, bool has_fma, for (i = stmt_num - 2; i >= 0; i--) stmts[i] = SSA_NAME_DEF_STMT (gimple_assign_rhs1 (stmts[i+1])); + /* Width should not be larger than op_num/2. */ + width = width <= op_num / 2 ? width : op_num / 2; + /* Build parallel dependency chain according to width. */ for (i = 0; i < width; i++) { -- 2.25.1