From patchwork Wed Dec 13 12:31:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 82050 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B8936384DEE4 for ; Wed, 13 Dec 2023 12:32:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 7C67D385417D for ; Wed, 13 Dec 2023 12:32:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7C67D385417D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7C67D385417D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702470739; cv=none; b=awBvL/vML4s4YoPbP6Cd4J76UJ2UZgPhVqIjHEWL5oQpHf5CfSAgbzUdtMz3cJYOS1xMtuMXMpDRtrW6mNsfUYiMPd6b/5ri0WplxmORzWSDVBZ0oQ396X3vhCkmxBtOI84fprZeIoXxI0+CnzQWbffWH9BAzvh2d4cnSRVVqcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702470739; c=relaxed/simple; bh=WJufVMc/Ov1THtao/zb21RB3U5Ae9rt7F7lPyCqlLD0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=twqsECaXw7oPDUD5c862W24nsueZAU1INEU8ClUxB4Ttb9zpj65gz9AjMd+HxjbTpAtlIItatgylzmiIyh6g1jPfY19G8YpUD+eptoBVw5R8c3976pZDtS0W0iglmuk3cYHrnjo7YZ+B8yVcAKGwPtq4/4ktG43eSGzCTaULxcw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6DBAB221C9 for ; Wed, 13 Dec 2023 12:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702470736; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rBVGXBK8wR+OMVjG3F9Ma8pvhxT1DalWuytRq4vCJMk=; b=B4cVxTiZFNQGEpAJt35s9pmsrCcEndL4o7sJPY1UCN1eAKtMb5kIc28z1yfuST9P+qmyn/ J1vwJhfpY5lskbps6d9Zfb1+JeJwRfpDd6OEJEk5rmDR/jZvr3wASox/s5kTpvgsXODsC3 ecA0VfXm4zIFqNW+DMbFk2FpqBStE+s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702470736; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rBVGXBK8wR+OMVjG3F9Ma8pvhxT1DalWuytRq4vCJMk=; b=tLpiZBgk3D94DrH613RiEWsoRDZi3pV4se66QwXXQq/lZNUycVmsWEhC9RKrIeGiyFmsip FMYEkOuFYZ4CYlBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1702470736; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rBVGXBK8wR+OMVjG3F9Ma8pvhxT1DalWuytRq4vCJMk=; b=B4cVxTiZFNQGEpAJt35s9pmsrCcEndL4o7sJPY1UCN1eAKtMb5kIc28z1yfuST9P+qmyn/ J1vwJhfpY5lskbps6d9Zfb1+JeJwRfpDd6OEJEk5rmDR/jZvr3wASox/s5kTpvgsXODsC3 ecA0VfXm4zIFqNW+DMbFk2FpqBStE+s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1702470736; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=rBVGXBK8wR+OMVjG3F9Ma8pvhxT1DalWuytRq4vCJMk=; b=tLpiZBgk3D94DrH613RiEWsoRDZi3pV4se66QwXXQq/lZNUycVmsWEhC9RKrIeGiyFmsip FMYEkOuFYZ4CYlBA== Date: Wed, 13 Dec 2023 13:31:12 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH 4/6] More explicit vector types MIME-Version: 1.0 X-Spam-Level: ** X-Spam-Score: 2.31 X-Spam-Level: X-Spam-Score: -0.60 X-Spamd-Result: default: False [-0.60 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%] X-Spam-Flag: NO Authentication-Results: smtp-out1.suse.de; none X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Message-Id: <20231213123235.B8936384DEE4@sourceware.org> This reduces more calls to get_vectype_for_scalar_type. * tree-vect-loop.cc (vect_transform_cycle_phi): Specify the vector type for invariant/external defs. * tree-vect-stmts.cc (vectorizable_shift): For invariant or external shifted operands use the result vector type. Specify the vector type for invariant/external defs. (vectorizable_store): Likewise. --- gcc/tree-vect-loop.cc | 2 +- gcc/tree-vect-stmts.cc | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index 3af4160426b..9e531921e29 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -8749,7 +8749,7 @@ vect_transform_cycle_phi (loop_vec_info loop_vinfo, correctly if ncopies is not one. */ vect_get_vec_defs_for_operand (loop_vinfo, reduc_stmt_info, ncopies, initial_def, - &vec_initial_defs); + &vec_initial_defs, vectype_out); } else if (STMT_VINFO_REDUC_TYPE (reduc_info) == CONST_COND_REDUCTION || STMT_VINFO_REDUC_TYPE (reduc_info) == COND_REDUCTION) diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index 5ad306e2b08..88401a2a00b 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -6126,19 +6126,11 @@ vectorizable_shift (vec_info *vinfo, "use not simple.\n"); return false; } - /* If op0 is an external or constant def, infer the vector type - from the scalar type. */ + /* If op0 is an external or constant def, use the output vector type. */ if (!vectype) - vectype = get_vectype_for_scalar_type (vinfo, TREE_TYPE (op0), slp_node); + vectype = vectype_out; if (vec_stmt) gcc_assert (vectype); - if (!vectype) - { - if (dump_enabled_p ()) - dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location, - "no vectype for scalar type\n"); - return false; - } nunits_out = TYPE_VECTOR_SUBPARTS (vectype_out); nunits_in = TYPE_VECTOR_SUBPARTS (vectype); @@ -6426,8 +6418,8 @@ vectorizable_shift (vec_info *vinfo, (a special case for certain kind of vector shifts); otherwise, operand 1 should be of a vector type (the usual case). */ vect_get_vec_defs (vinfo, stmt_info, slp_node, ncopies, - op0, &vec_oprnds0, - vec_oprnd1 ? NULL_TREE : op1, &vec_oprnds1); + op0, vectype, &vec_oprnds0, + vec_oprnd1 ? NULL_TREE : op1, op1_vectype, &vec_oprnds1); /* Arguments are ready. Create the new vector stmt. */ FOR_EACH_VEC_ELT (vec_oprnds0, i, vop0) @@ -8537,7 +8529,7 @@ vectorizable_store (vec_info *vinfo, op = vect_get_store_rhs (next_stmt_info); if (!costing_p) vect_get_vec_defs (vinfo, next_stmt_info, slp_node, ncopies, op, - &vec_oprnds); + vectype, &vec_oprnds); else update_prologue_cost (&prologue_cost, op); unsigned int group_el = 0; @@ -9303,7 +9295,7 @@ vectorizable_store (vec_info *vinfo, { vect_get_vec_defs_for_operand (vinfo, next_stmt_info, ncopies, op, - gvec_oprnds[i]); + gvec_oprnds[i], vectype); vec_oprnd = (*gvec_oprnds[i])[0]; dr_chain.quick_push (vec_oprnd); }