From patchwork Mon Jul 1 08:51:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kong lingling X-Patchwork-Id: 1954545 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=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=mIkEuaed; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WCKYf3db4z1xpP for ; Mon, 1 Jul 2024 18:52:34 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C798D3899091 for ; Mon, 1 Jul 2024 08:52:32 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) by sourceware.org (Postfix) with ESMTPS id 83523389901D for ; Mon, 1 Jul 2024 08:51:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 83523389901D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 83523389901D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::f2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719823909; cv=none; b=Mad5wg4m3MY+YPQRIdfu2ROuEvoSOWxxoii397A6mrKgXvgohycyZcta/CVCTcfkECZhVD5phHWlHTmzAEUPlP5tu3dD6NdNNV2GStcKSeDAeof7o9nQTY7H/UF/3Ml0T2gC2B2DN87y64d6kY3KQS0DLzuySVqptxG6QL8jp/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719823909; c=relaxed/simple; bh=M09ZMg44utT4uV+7X7kGbDQU2FIZ1nqe2uaO3dnTOm4=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=WxIfCOekm9Rc65BgWI6pM9HHxiFclX1hPHq/rgCOsvkFgeFfemoW1QhqHuXQEdMix+1DTbES81mMr9pP7Tmp14dncm2pwtPnIT2kGC8fY+PhPY/hETRFlWqdbKn/3ODW49SgGvMw8Gc5ZE0E9l2a1822k1IDXHvCJ9CY0IZoNDE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-6b50c3aeb83so14154976d6.1 for ; Mon, 01 Jul 2024 01:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719823905; x=1720428705; darn=gcc.gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=iMcN0JoF//SqYKHHSaqOTTpd09guQGD3HzHsef4sbXk=; b=mIkEuaedkXSJYQsLhWwpO0j0bLfiqMkCEwuXJKHLI0ot1lQIz1x89nptUCUzEppcfe Zr/Y05n5a00Of3MFlWLtT13Mzp8lPPwvF2C3ap+Nz93cBSsYnx4j72B9ZUY+pR6ES4+j nubIaQKctBAf3lHBIzWIekKO5FQwNNksQj1ud63rqJ5MN9ZBodhknG6h6NPWnkT39vOg AhODgJ4PElOMOOddLI4fTCD8MLzF0TXUxa8KrBxVx/2wIR3aYbyC/OOVIk78PBBtmVsI rEmwwIOEJn3QhsxuVjj3JyoH87Khnp90dOMbXUtT70Rrvk4D6W6W4wqeR6LfbumynRre nZYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719823905; x=1720428705; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iMcN0JoF//SqYKHHSaqOTTpd09guQGD3HzHsef4sbXk=; b=s7UMmo4iHxKpgj5nGHnixD9rIURiRTGQMQBedRLLsViv2pb+C5oe8dJUHEycipc81c wf/JDIDsXi9L4szGf0kRVYphC8ks7Fs9nCCGE0w+qPWtrgCo7/PPEccCesz/Vrqio7wq 0vgKDcpHI0aMPfeAzFgwwbIIl50wtfm9oUmsm0On3C7W/fQuC9YLWYavdasgFcxdR6+t xYiLrX2BQnyFvkqOWvJOWC7+YnzoYMct9SJzD8yOeG/Rz1wniezhW3vSPHsY738oZyDq wnA3uyZzH/zr4njv5NLUVNFnTFEtiM7Bt/1n1X4xjqSwKtcXfgYVCPgar0mEO+O7NMMt wuCQ== X-Gm-Message-State: AOJu0Yw+xHE7obmkmjapLbEKjq19qeeTpol8+mHVqcDj+mtg4u0qu+Z+ 8u0fn7P5Rp2hKO9eTcw5Yr64NnbCyE1peoUdCuCWmvOJY2xXG1oX23xpaeRwyGY87R6PqbZ77Ca sFjj4oIkSJXLBWsG7ZK03Nyidxp7t5Uvc X-Google-Smtp-Source: AGHT+IFgyHo3sHOR6ycHXZMLk2faUnN5h3s3fNPPApz3SrwpYb20SvS+t30dExeMvQymiG7xGmCM0EXkPrA7mK2qO8U= X-Received: by 2002:a05:6214:76d:b0:6b5:485:ea30 with SMTP id 6a1803df08f44-6b5b7083faamr65503726d6.3.1719823904525; Mon, 01 Jul 2024 01:51:44 -0700 (PDT) MIME-Version: 1.0 From: kong lingling Date: Mon, 1 Jul 2024 16:51:33 +0800 Message-ID: Subject: [PATCH] i386: Support APX NF and NDD for imul/mul To: gcc-patches@gcc.gnu.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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 Add some missing APX NF and NDD support for imul and mul. Bootstrapped and regtested on x86_64-pc-linux-gnu{-m32,}. Ok for trunk? gcc/ChangeLog: * config/i386/i386.md (*imulhizu): Added APX NF support. (*imulhizu): New define_insn. (*mulsi3_1_zext): Ditto. (*mul3_1): Ditto. (*mulqihi3_1): Ditto. (*mul3_1): Added APX NDD support. (*mulv4): Ditto. (*mulvhi4): Ditto. gcc/testsuite/ChangeLog: * gcc.target/i386/apx-ndd.c: Add test for imul ndd. --- gcc/config/i386/i386.md | 98 +++++++++++++------------ gcc/testsuite/gcc.target/i386/apx-ndd.c | 8 ++ 2 files changed, 61 insertions(+), 45 deletions(-) "lea(?:l|q)\[^\n\r]\\(%r(?:d|s)i,%r(?:d|s)i\\), %(?:|r|e)ax" 4 } } */ /* { dg-final { scan-assembler-times "add(?:b|l|w|q)\[^\n\r]%(?:|r|e)si(?:|l), \\(%(?:r|e)di\\), %(?:|r|e)a(?:x|l)" 4 } } */ @@ -200,3 +206,5 @@ FOO4 (uint64_t, rol, <<, >>, 1) /* { dg-final { scan-assembler-times "shr(?:b|l|w|q)\[^\n\r]*7, %(?:|r|e)di(?:|l), %(?:|r|e)a(?:x|l)" 4 } } */ /* { dg-final { scan-assembler-times "ror(?:b|l|w|q)\[^\n\r]*1, %(?:|r|e)di(?:|l), %(?:|r|e)a(?:x|l)" 4 } } */ /* { dg-final { scan-assembler-times "rol(?:b|l|w|q)\[^\n\r]*1, %(?:|r|e)di(?:|l), %(?:|r|e)a(?:x|l)" 4 } } */ +/* { dg-final { scan-assembler-times "imul(?:l|q)\[^\n\r]%(?:|r|e)(?:|s|d)i, %(?:r|e)(?:|s|d)i, %(?:|r|e)ax" 3 } } */ +/* { dg-final { scan-assembler-times "imul(?:l|w|q)\[^\n\r]\\(%rdi\\), %(?:|r|e)si, %(?:|r|e)ax" 3 } } */ -- 2.31.1 diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index fd48e764469..c1f29fee412 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -6488,8 +6488,8 @@ (define_subst_attr "nf_nonf_x64_attr" "nf_subst" "noapx_nf" "x64") (define_subst "nf_subst" - [(set (match_operand:SWI 0) - (match_operand:SWI 1))] + [(set (match_operand:SWIDWI 0) + (match_operand:SWIDWI 1))] "" [(set (match_dup 0) (match_dup 1)) @@ -10028,24 +10028,26 @@ ;; On BDVER1, all HI MULs use DoublePath (define_insn "*mul3_1" - [(set (match_operand:SWIM248 0 "register_operand" "=r,r,r") + [(set (match_operand:SWIM248 0 "register_operand" "=r,r,r,r") (mult:SWIM248 - (match_operand:SWIM248 1 "nonimmediate_operand" "%rm,rm,0") - (match_operand:SWIM248 2 "" "K,,r")))] + (match_operand:SWIM248 1 "nonimmediate_operand" "%rm,rm,0,r") + (match_operand:SWIM248 2 "" "K,,r,r")))] "!(MEM_P (operands[1]) && MEM_P (operands[2])) && " "@ imul{}\t{%2, %1, %0|%0, %1, %2} imul{}\t{%2, %1, %0|%0, %1, %2} - imul{}\t{%2, %0|%0, %2}" + imul{}\t{%2, %0|%0, %2} + imul{}\t{%2, %1, %0|%0, %1, %2}" [(set_attr "type" "imul") - (set_attr "prefix_0f" "0,0,1") + (set_attr "prefix_0f" "0,0,1,1") + (set_attr "isa" "*,*,*,apx_ndd") (set (attr "athlon_decode") (cond [(eq_attr "cpu" "athlon") (const_string "vector") (eq_attr "alternative" "1") (const_string "vector") - (and (eq_attr "alternative" "2") + (and (eq_attr "alternative" "2,3") (ior (match_test "mode == HImode") (match_operand 1 "memory_operand"))) (const_string "vector")] @@ -10063,33 +10065,34 @@ (const_string "direct"))) (set_attr "mode" "")]) -(define_insn "*imulhizu" +(define_insn "*imulhizu" [(set (match_operand:SWI48x 0 "register_operand" "=r,r") (zero_extend:SWI48x (mult:HI (match_operand:HI 1 "nonimmediate_operand" "%rm,rm") - (match_operand:HI 2 "immediate_operand" "K,n")))) - (clobber (reg:CC FLAGS_REG))] - "TARGET_APX_ZU" + (match_operand:HI 2 "immediate_operand" "K,n"))))] + "TARGET_APX_ZU && " "@ - imulzu{w}\t{%2, %1, %w0|%w0, %1, %2} - imulzu{w}\t{%2, %1, %w0|%w0, %1, %2}" + imulzu{w}\t{%2, %1, %w0|%w0, %1, %2} + imulzu{w}\t{%2, %1, %w0|%w0, %1, %2}" [(set_attr "type" "imul") (set_attr "mode" "HI")]) -(define_insn "*mulsi3_1_zext" - [(set (match_operand:DI 0 "register_operand" "=r,r,r") +(define_insn "*mulsi3_1_zext" + [(set (match_operand:DI 0 "register_operand" "=r,r,r,r") (zero_extend:DI - (mult:SI (match_operand:SI 1 "nonimmediate_operand" "%rm,rm,0") - (match_operand:SI 2 "x86_64_general_operand" "K,e,BMr")))) - (clobber (reg:CC FLAGS_REG))] + (mult:SI (match_operand:SI 1 "nonimmediate_operand" "%rm,rm,0,r") + (match_operand:SI 2 "x86_64_general_operand" "K,e,BMr,BMr"))))] "TARGET_64BIT - && !(MEM_P (operands[1]) && MEM_P (operands[2]))" + && !(MEM_P (operands[1]) && MEM_P (operands[2])) + && " "@ - imul{l}\t{%2, %1, %k0|%k0, %1, %2} - imul{l}\t{%2, %1, %k0|%k0, %1, %2} - imul{l}\t{%2, %k0|%k0, %2}" + imul{l}\t{%2, %1, %k0|%k0, %1, %2} + imul{l}\t{%2, %1, %k0|%k0, %1, %2} + imul{l}\t{%2, %k0|%k0, %2} + imul{l}\t{%2, %1, %k0|%k0, %1, %2}" [(set_attr "type" "imul") - (set_attr "prefix_0f" "0,0,1") + (set_attr "prefix_0f" "0,0,1,1") + (set_attr "isa" "*,*,*,apx_ndd") (set (attr "athlon_decode") (cond [(eq_attr "cpu" "athlon") (const_string "vector") @@ -10158,30 +10161,32 @@ [(set (reg:CCO FLAGS_REG) (eq:CCO (mult: (sign_extend: - (match_operand:SWI48 1 "nonimmediate_operand" "%rm,0")) + (match_operand:SWI48 1 "nonimmediate_operand" "%rm,0,r")) (sign_extend: - (match_operand:SWI48 2 "x86_64_sext_operand" "We,mr"))) + (match_operand:SWI48 2 "x86_64_sext_operand" "We,mr,mr"))) (sign_extend: (mult:SWI48 (match_dup 1) (match_dup 2))))) - (set (match_operand:SWI48 0 "register_operand" "=r,r") + (set (match_operand:SWI48 0 "register_operand" "=r,r,r") (mult:SWI48 (match_dup 1) (match_dup 2)))] "!(MEM_P (operands[1]) && MEM_P (operands[2]))" "@ imul{}\t{%2, %1, %0|%0, %1, %2} - imul{}\t{%2, %0|%0, %2}" + imul{}\t{%2, %0|%0, %2} + imul{}\t{%2, %1, %0|%0, %1, %2}" [(set_attr "type" "imul") - (set_attr "prefix_0f" "0,1") + (set_attr "prefix_0f" "0,1,1") + (set_attr "isa" "*,*,apx_ndd") (set (attr "athlon_decode") (cond [(eq_attr "cpu" "athlon") (const_string "vector") (eq_attr "alternative" "0") (const_string "vector") - (and (eq_attr "alternative" "1") + (and (eq_attr "alternative" "1,2") (match_operand 1 "memory_operand")) (const_string "vector")] (const_string "direct"))) (set (attr "amdfam10_decode") - (cond [(and (eq_attr "alternative" "1") + (cond [(and (eq_attr "alternative" "1,2") (match_operand 1 "memory_operand")) (const_string "vector")] (const_string "direct"))) @@ -10192,17 +10197,20 @@ [(set (reg:CCO FLAGS_REG) (eq:CCO (mult:SI (sign_extend:SI - (match_operand:HI 1 "nonimmediate_operand" "%0")) + (match_operand:HI 1 "nonimmediate_operand" "%0,r")) (sign_extend:SI - (match_operand:HI 2 "nonimmediate_operand" "mr"))) + (match_operand:HI 2 "nonimmediate_operand" "mr,mr"))) (sign_extend:SI (mult:HI (match_dup 1) (match_dup 2))))) - (set (match_operand:HI 0 "register_operand" "=r") + (set (match_operand:HI 0 "register_operand" "=r,r") (mult:HI (match_dup 1) (match_dup 2)))] "!(MEM_P (operands[1]) && MEM_P (operands[2]))" - "imul{w}\t{%2, %0|%0, %2}" + "@ + imul{w}\t{%2, %0|%0, %2} + imul{w}\t{%2, %1, %0|%0, %1, %2}" [(set_attr "type" "imul") (set_attr "prefix_0f" "1") + (set_attr "isa" "*,apx_ndd") (set_attr "athlon_decode" "vector") (set_attr "amdfam10_decode" "direct") (set_attr "bdver1_decode" "double") @@ -10451,16 +10459,16 @@ operands[5] = GEN_INT ( * BITS_PER_UNIT); }) -(define_insn "*mul3_1" +(define_insn "*mul3_1" [(set (match_operand: 0 "register_operand" "=A") (mult: (sign_extend: (match_operand:DWIH 1 "register_operand" "%a")) (sign_extend: - (match_operand:DWIH 2 "nonimmediate_operand" "rm")))) - (clobber (reg:CC FLAGS_REG))] - "!(MEM_P (operands[1]) && MEM_P (operands[2]))" - "imul{}\t%2" + (match_operand:DWIH 2 "nonimmediate_operand" "rm"))))] + "!(MEM_P (operands[1]) && MEM_P (operands[2])) + && " + "imul{}\t%2" [(set_attr "type" "imul") (set_attr "length_immediate" "0") (set (attr "athlon_decode") @@ -10471,17 +10479,17 @@ (set_attr "bdver1_decode" "direct") (set_attr "mode" "")]) -(define_insn "*mulqihi3_1" +(define_insn "*mulqihi3_1" [(set (match_operand:HI 0 "register_operand" "=a") (mult:HI (any_extend:HI (match_operand:QI 1 "register_operand" "%0")) (any_extend:HI - (match_operand:QI 2 "nonimmediate_operand" "qm")))) - (clobber (reg:CC FLAGS_REG))] + (match_operand:QI 2 "nonimmediate_operand" "qm"))))] "TARGET_QIMODE_MATH - && !(MEM_P (operands[1]) && MEM_P (operands[2]))" - "mul{b}\t%2" + && !(MEM_P (operands[1]) && MEM_P (operands[2])) + && " + "mul{b}\t%2" [(set_attr "type" "imul") (set_attr "length_immediate" "0") (set (attr "athlon_decode") diff --git a/gcc/testsuite/gcc.target/i386/apx-ndd.c b/gcc/testsuite/gcc.target/i386/apx-ndd.c index 0ff4df0780c..6c88aff911a 100644 --- a/gcc/testsuite/gcc.target/i386/apx-ndd.c +++ b/gcc/testsuite/gcc.target/i386/apx-ndd.c @@ -170,6 +170,12 @@ FOO4 (uint16_t, rol, <<, >>, 1) FOO4 (uint32_t, rol, <<, >>, 1) FOO4 (uint64_t, rol, <<, >>, 1) +FOO1 (short, imul, *) +FOO1 (int, imul, *) +FOO1 (int64_t, imul, *) +FOO2 (short, imul, *) +FOO2 (int, imul, *) +FOO2 (int64_t, imul, *) /* { dg-final { scan-assembler-times "add(?:b|l|w|q)\[^\n\r]*1, \\(%(?:r|e)di\\), %(?:|r|e)a(?:x|l)" 4 } } */ /* { dg-final { scan-assembler-times