From patchwork Mon Jun 26 01:31:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liuhongt X-Patchwork-Id: 112693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7183820vqr; Sun, 25 Jun 2023 18:32:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6TqALGgiPc9oh8gfEnNnt18xNBd9NXv4d1nHuUvALwQdh35MP/zAGlnAHhf1lTC918eBhC X-Received: by 2002:a17:907:5ca:b0:987:59b6:c9fa with SMTP id wg10-20020a17090705ca00b0098759b6c9famr23284911ejb.19.1687743171314; Sun, 25 Jun 2023 18:32:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687743171; cv=none; d=google.com; s=arc-20160816; b=v/hCKbZMzGWNkbmeSnIR9HpANATNz+hgepjD7K9NdEAetMY7rn+WD3IsSSTsA582d9 X6cN3T+Lkk//F+J/+PwW6UbJfpYKTghkEqybSxSqBWjduwivvAxFnZwctPKzlLb/rr7x Nvf6AvNaE4IFicmYVgAEE08eMOatdXBmv7Ycb+NfSSrtEY8I/7RIzmMtVUg2jgzmfDAV BiDf6s8tGRbwXApZPoh8+puW3beTy+8gv0RRWJYKhTaPfhyUm/Du6MCgQrV5vMG2mxei ZvkBp5hP/efGqtiEJqvzEwRMB8wq2jOm4wl0PaMT9lbwjSHfzBIS+r1SD8Vm92T1P9su jGAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=+mD9eRDdUFTUpWNIQsrmg0xq96TdSFwMeFEsyfocm6E=; fh=+hLOyNjOxs7Oq1aRHEw7XxfEX1oHkVQWuvrPt77y0XY=; b=ke9GmAMJuQf9GEruIG8e+A/PFxVPabH0XNI4YFmi+oHcPL5ppk73JNZ0kWkPtbxm1N wAVVYR8S2qoGuHpxxqlxMHVe37JdwTPvFZbwmBE1lGxpn/Cdcwyi/q8vBEYcIPuPDT+H TLl9XIlkA8gEQlCq+jjXXZ7cn9LOC99EQBQ+Bi5Uq9Cjxp6TyYwNYGlgKid5e/2gcixp QqPSlgxz3LTFpr08YnnfpQtxzdei5EP5LnOua/pFQNNhFYywd5rBQHpuGdcmwG1Gzkn5 aEqWKTp76kDgomWNbMEYsUxFNIslKvZNKajB2pt9/Aq4vINx+/cgsB+OKb3i7v8l4iSg 0mow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=gYq0kTxP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id gg18-20020a170906e29200b00988357b5f3fsi2256554ejb.758.2023.06.25.18.32.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 18:32:51 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=gYq0kTxP; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 331553858D33 for ; Mon, 26 Jun 2023 01:32:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 331553858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687743170; bh=+mD9eRDdUFTUpWNIQsrmg0xq96TdSFwMeFEsyfocm6E=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=gYq0kTxP9fi9Pm+ecLQnMt2LWAjFnxqbhujGYtSYRLenZdANVkqt8kUkOsZ5C1EX9 ksqRqXEOHH9CLnKIE72947BHfawWWb/mRxdZACqXMiui4wzfnq8lmpSDI0Lfg0Ro8n kv5xXy1kTA/xrf1uSQhs3eyGYrM7A6IgXxgpgp8c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by sourceware.org (Postfix) with ESMTPS id 4F13B3858D33 for ; Mon, 26 Jun 2023 01:31:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F13B3858D33 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="391353078" X-IronPort-AV: E=Sophos;i="6.01,158,1684825200"; d="scan'208";a="391353078" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jun 2023 18:31:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10752"; a="785969704" X-IronPort-AV: E=Sophos;i="6.01,158,1684825200"; d="scan'208";a="785969704" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by fmsmga004.fm.intel.com with ESMTP; 25 Jun 2023 18:31:05 -0700 Received: from shliclel4217.sh.intel.com (shliclel4217.sh.intel.com [10.239.240.127]) by shvmail03.sh.intel.com (Postfix) with ESMTP id 320FA1005604; Mon, 26 Jun 2023 09:31:05 +0800 (CST) To: gcc-patches@gcc.gnu.org Cc: richard.sandiford@arm.com, rguenther@suse.de Subject: [PATCH 1/3] Use cvt_op to save intermediate type operand instead of "subtle" vec_dest. Date: Mon, 26 Jun 2023 09:31:03 +0800 Message-Id: <20230626013105.18788-1-hongtao.liu@intel.com> X-Mailer: git-send-email 2.39.1.388.g2fc9e9ca3c MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: liuhongt via Gcc-patches From: liuhongt Reply-To: liuhongt Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769726983872319134?= X-GMAIL-MSGID: =?utf-8?q?1769726983872319134?= When there're multiple operands in vec_oprnds0, vec_dest will be overwrited to vectype_out, but in multi_step_cvt case, cvt_type is expected. It caused an ICE when verify_gimple_in_cfg. Bootstrapped and regtested on x86_64-pc-linux-gnu{-m32,} and aarch64-linux-gnu. Ok for trunk? gcc/ChangeLog: PR tree-optimization/110371 PR tree-optimization/110018 * tree-vect-stmts.cc (vectorizable_conversion): Use cvt_op to save intermediate type operand instead of "subtle" vec_dest for case NONE. gcc/testsuite/ChangeLog: * gcc.target/aarch64/pr110371.c: New test. --- gcc/testsuite/gcc.target/aarch64/pr110371.c | 20 ++++++++++++++++++++ gcc/tree-vect-stmts.cc | 14 ++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.target/aarch64/pr110371.c diff --git a/gcc/testsuite/gcc.target/aarch64/pr110371.c b/gcc/testsuite/gcc.target/aarch64/pr110371.c new file mode 100644 index 00000000000..444e514e04f --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/pr110371.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O3" } */ + +typedef struct dest +{ + double m[3][3]; +} dest; + +typedef struct src +{ + int m[3][3]; +} src; + +void +foo (dest *a, src* s) +{ + for (int i = 0; i != 3; i++) + for (int j = 0; j != 3; j++) + a->m[i][j] = s->m[i][j]; +} diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 85d1f3ae52c..1748555a625 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -5044,7 +5044,7 @@ vectorizable_conversion (vec_info *vinfo, gimple **vec_stmt, slp_tree slp_node, stmt_vector_for_cost *cost_vec) { - tree vec_dest; + tree vec_dest, cvt_op = NULL_TREE; tree scalar_dest; tree op0, op1 = NULL_TREE; loop_vec_info loop_vinfo = dyn_cast (vinfo); @@ -5568,6 +5568,13 @@ vectorizable_conversion (vec_info *vinfo, case NONE: vect_get_vec_defs (vinfo, stmt_info, slp_node, ncopies, op0, &vec_oprnds0); + /* vec_dest is intermediate type operand when multi_step_cvt. */ + if (multi_step_cvt) + { + cvt_op = vec_dest; + vec_dest = vec_dsts[0]; + } + FOR_EACH_VEC_ELT (vec_oprnds0, i, vop0) { /* Arguments are ready, create the new vector stmt. */ @@ -5575,12 +5582,11 @@ vectorizable_conversion (vec_info *vinfo, if (multi_step_cvt) { gcc_assert (multi_step_cvt == 1); - new_stmt = vect_gimple_build (vec_dest, codecvt1, vop0); - new_temp = make_ssa_name (vec_dest, new_stmt); + new_stmt = vect_gimple_build (cvt_op, codecvt1, vop0); + new_temp = make_ssa_name (cvt_op, new_stmt); gimple_assign_set_lhs (new_stmt, new_temp); vect_finish_stmt_generation (vinfo, stmt_info, new_stmt, gsi); vop0 = new_temp; - vec_dest = vec_dsts[0]; } new_stmt = vect_gimple_build (vec_dest, code1, vop0); new_temp = make_ssa_name (vec_dest, new_stmt);