From patchwork Tue Oct 15 03:29:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Hongtao" X-Patchwork-Id: 1997173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=RbEKBPzG; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XSKP12Pdgz1xvy for ; Tue, 15 Oct 2024 14:30:28 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0DCCE3857C7F for ; Tue, 15 Oct 2024 03:30:27 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by sourceware.org (Postfix) with ESMTPS id 150C43858D28 for ; Tue, 15 Oct 2024 03:29:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 150C43858D28 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 150C43858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728963004; cv=none; b=ONQ2s1PB0B9qIjm9GDZqRQ6MPLJUx9bOfZhz0Fnawg8bjLF0yym08k2ATkXfdbCXu5cH+HkKnTahqmJRMVL/BzuBT+v385HI1srFs/TWm7GGkeE3cAMHYPiLER/J4Aa+dX6Q2tItWberPvNBm3FetPZcTrC7Mleh9p55tcxm1vo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728963004; c=relaxed/simple; bh=ZclcXPJcP0YpKu0Oy5OEhSU3Od+lqBvRXJ6cGKBuw3Y=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=UYdl60LUxGolKedlqhMgfGvrYRRQe9WTziBoyco8+60E+rKQJqv6rV4umIN09h+E/XYa/NR48h+ZinYShEHF3S309nFzgJ8d+svqBFu2HjDZ6CdEbyP6zjcqAo2xW/PQMUuYZ4asvZrvXa27O0UoG+l2c2bS55Uf37wsPK3EiRU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728962999; x=1760498999; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZclcXPJcP0YpKu0Oy5OEhSU3Od+lqBvRXJ6cGKBuw3Y=; b=RbEKBPzGac8qd8WVkBNHRYiCpTWUsm21xKMDqM2Qta7buaj52MZ+iP6D h5LrHUbzv1rn8XCaa5Kl5szphiR9CQCzOfhfhjE8brmgdv/e+eoQLT11l HHmvclkrqNG2WgXUNpBeCAxJs3sp2xFLadrpWBgFVpyc93o5AXWojKFGt woBPPs6zuIBNUktuz9Fd8VcUPF3Vml0go5M7H0h9eXkCHSXyGjuZIiPmF YoW8LsukrSmZlch5wSpaJWk4ZW3bdSK9at68tT7T/6N6dURfZ74ssj8Uc NKxN2/YYQkcVoYQC3bVJ5nnrELKYOoVOCw6Ovi8+kQ3SpHfRKyy9Mhmhg A==; X-CSE-ConnectionGUID: ONTWwQQ+RoKd5vb2xPkOfw== X-CSE-MsgGUID: cKD7dPodTnyLZj5170mGpw== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="28465090" X-IronPort-AV: E=Sophos;i="6.11,204,1725346800"; d="scan'208";a="28465090" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2024 20:29:58 -0700 X-CSE-ConnectionGUID: LXsm0kFETR6Dz7OpRSmpOg== X-CSE-MsgGUID: h/rx8fovSk+w6bwpIQU8+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,204,1725346800"; d="scan'208";a="82381270" Received: from shliclel4217.sh.intel.com ([10.239.240.127]) by fmviesa004.fm.intel.com with ESMTP; 14 Oct 2024 20:29:57 -0700 From: liuhongt To: gcc-patches@gcc.gnu.org Cc: segher@kernel.crashing.org, jeffreyalaw@gmail.com Subject: [PATCH 1/2] [Middle-end] Canonicalize (vec_merge (fma op2 op1 op3) op1 mask) to (vec_merge (fma op1 op2 op3) op1 mask). Date: Tue, 15 Oct 2024 11:29:54 +0800 Message-Id: <20241015032955.3677006-2-hongtao.liu@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20241015032955.3677006-1-hongtao.liu@intel.com> References: <7p8r18n6-668q-37pr-7o70-74rr02673919@fhfr.qr> <20241015032955.3677006-1-hongtao.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP 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~incoming=patchwork.ozlabs.org@gcc.gnu.org For x86 masked fma, there're 2 rtl representations 1) (vec_merge (fma op2 op1 op3) op1 mask) 2) (vec_merge (fma op1 op2 op3) op1 mask). 5894(define_insn "_fmadd__mask" 5895 [(set (match_operand:VFH_AVX512VL 0 "register_operand" "=v,v") 5896 (vec_merge:VFH_AVX512VL 5897 (fma:VFH_AVX512VL 5898 (match_operand:VFH_AVX512VL 1 "nonimmediate_operand" "0,0") 5899 (match_operand:VFH_AVX512VL 2 "" ",v") 5900 (match_operand:VFH_AVX512VL 3 "" "v,")) 5901 (match_dup 1) 5902 (match_operand: 4 "register_operand" "Yk,Yk")))] 5903 "TARGET_AVX512F && " 5904 "@ 5905 vfmadd132\t{%2, %3, %0%{%4%}|%0%{%4%}, %3, %2} 5906 vfmadd213\t{%3, %2, %0%{%4%}|%0%{%4%}, %2, %3}" 5907 [(set_attr "type" "ssemuladd") 5908 (set_attr "prefix" "evex") 5909 (set_attr "mode" "")]) Here op1 has constraint "0", and the scecond op1 is (match_dup 1), we once tried to replace it with (match_operand:M 5 "nonimmediate_operand" "0")) to enable more flexibility for pattern match and recog, but it triggered an ICE in reload(reload can handle at most one perand with "0" constraint). So we need either add 2 patterns in the backend or just do the canonicalization in the middle-end. gcc/ChangeLog: * combine.cc (maybe_swap_commutative_operands): Canonicalize (vec_merge (fma op2 op1 op3) op1 mask) to (vec_merge (fma op1 op2 op3) op1 mask). --- gcc/combine.cc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gcc/combine.cc b/gcc/combine.cc index fef06a6cdc0..aa40fdcc50d 100644 --- a/gcc/combine.cc +++ b/gcc/combine.cc @@ -5656,6 +5656,31 @@ maybe_swap_commutative_operands (rtx x) SUBST (XEXP (x, 1), temp); } + /* Canonicalize (vec_merge (fma op2 op1 op3) op1 mask) to + (vec_merge (fma op1 op2 op3) op1 mask). */ + if (GET_CODE (x) == VEC_MERGE + && GET_CODE (XEXP (x, 0)) == FMA) + { + rtx fma_op1 = XEXP (XEXP (x, 0), 0); + rtx fma_op2 = XEXP (XEXP (x, 0), 1); + rtx masked_op = XEXP (x, 1); + if (rtx_equal_p (masked_op, fma_op2)) + { + if (GET_CODE (fma_op1) == NEG) + { + fma_op1 = XEXP (fma_op1, 0); + SUBST (XEXP (XEXP (XEXP (x, 0), 0), 0), fma_op2); + SUBST (XEXP (XEXP (x, 0), 1), fma_op1); + } + else + { + SUBST (XEXP (XEXP (x, 0), 0), fma_op2); + SUBST (XEXP (XEXP (x, 0), 1), fma_op1); + } + + } + } + unsigned n_elts = 0; if (GET_CODE (x) == VEC_MERGE && CONST_INT_P (XEXP (x, 2))