From patchwork Wed Dec 21 03:16:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kewen.Lin" X-Patchwork-Id: 35235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3310358wrn; Tue, 20 Dec 2022 19:17:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXuHpBmCHHT0tMCxDRycJgMHns7VfRqBw2GerGztX/9HJPnvbNvZX2x5avs4IwN/WZ6ZQ4Y6 X-Received: by 2002:a17:906:644e:b0:7fd:f1b5:7fd5 with SMTP id l14-20020a170906644e00b007fdf1b57fd5mr13901473ejn.19.1671592650547; Tue, 20 Dec 2022 19:17:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671592650; cv=none; d=google.com; s=arc-20160816; b=YvaPNRuxV5rUtklSvyT2wfYL4zLMH+uTXq6F6oWZJ9LIDarxu/uRnA8DKQ6CqeGV2k At9zWRGFsxySEZhA6fdwlhXaWZtckIMYD2Yw/3NwbhLABhLDbcwkgLyDwK3xYFO0g2Gr s7KLftkfgVrXHSPdY7+JamCSGsrycSmcCR8WRkGSKRDPt8ffSlCysbYzy0/m/Zdk8hsC dLUFSB6Fdh0+WtLDmzY544R+uJ78aFyIPzruA5EOitxnyaCRoGpcxTma5QvUk4Qig9eB uRfw9kfJ4s3VdCAkPkyllZPF1vrz83cOz20dE1qLaFI2qzcrB4x3yMOijPvsL1aLO5j+ malA== 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:subject:cc:to:content-language:user-agent :mime-version:date:message-id:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=Z02n2cyOQw7H1ACW+0nTNrKmadaXm6txfQliz/IHBL4=; b=cgsbXDqiQ8bAMEj30WT3Rz1GMoxqkJfsi/UsFpTx0t4teGuXWgF68R0o3NS+kUe4c7 rKHJ6eAwcr6sSaxeHAolN1DEDjk9A3pUBVL007rFzO1Gvn0VFmtf11Z0nk7Lo8D0zp4j tN95Y+9bjPXduvRWDO2W5A+BOrXle/zaGb9wihGADcbQpw1LPt8WVcMgdMcv/EBJ898j MQfo5hoCeeVKiIxMUAujZ4hjbN7nq+7aQalTGI0SQmsi8UFjnspia+2zvqHwcuHo1N0B K1axXoJt6N3WCx01McMObYmwQ/WrWJhhJ7D6cmVF9GRXqBbMpWEE4gPpxrTnFGNmBYpK h1IQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=UXFHNQVs; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id q6-20020a1709064cc600b007c172bd3687si10180595ejt.585.2022.12.20.19.17.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 19:17:30 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=UXFHNQVs; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 4CC813858281 for ; Wed, 21 Dec 2022 03:17:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CC813858281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671592649; bh=Z02n2cyOQw7H1ACW+0nTNrKmadaXm6txfQliz/IHBL4=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=UXFHNQVsD8iDOpVn/yJ/GnS/R8hUuL2ZgAfo7jlbOc82HFFjZNt0HOLcRZJ15EJ7n 5i/rukH9zQkGFV8zcF8YGGmabC9GlRtQ3dOwhZJfymWK1XjHRZKJTL8zjDVe1Gvln7 5qas0u+W2i4p6C17Rbm3NdKBy27DruvPNGfJdA7M= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id CAB053858D1E for ; Wed, 21 Dec 2022 03:16:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CAB053858D1E Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BL3BaJx007723; Wed, 21 Dec 2022 03:16:45 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3mkt17g3km-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 03:16:44 +0000 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 2BL3EO7A019008; Wed, 21 Dec 2022 03:16:44 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3mkt17g3k2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 03:16:44 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 2BKIjo9g020676; Wed, 21 Dec 2022 03:16:42 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3mh6yy4uwu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Dec 2022 03:16:41 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 2BL3GdrG23659186 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 21 Dec 2022 03:16:39 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8374620043; Wed, 21 Dec 2022 03:16:39 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DB3C520049; Wed, 21 Dec 2022 03:16:37 +0000 (GMT) Received: from [9.197.239.17] (unknown [9.197.239.17]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 21 Dec 2022 03:16:37 +0000 (GMT) Message-ID: <6f698424-9e14-85d5-1af6-9b2b7bbaed4a@linux.ibm.com> Date: Wed, 21 Dec 2022 11:16:36 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Content-Language: en-US To: GCC Patches Cc: Segher Boessenkool , David Edelsohn Subject: [PATCH, committed] rs6000: Fix the wrong location of OPTION_MASK_P10_FUSION setting hunk X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: XSeyFbYNJ7yCNIw4BEvx3KlezfUI0c7S X-Proofpoint-GUID: 1xwxEdtLEqVv_6Q4SrSBtUsJd_oB3HuB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-12-20_08,2022-12-20_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 adultscore=0 bulkscore=0 suspectscore=0 spamscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2212210018 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H2, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Kewen.Lin via Gcc-patches" From: "Kewen.Lin" Reply-To: "Kewen.Lin" 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?1752791935122162603?= X-GMAIL-MSGID: =?utf-8?q?1752791935122162603?= Hi, The hunk for setting flag OPTION_MASK_P10_FUSION locates wrongly between the if and else if block for OPTION_MASK_MMA. This is to fix this oversight accordingly. Bootstrapped and regtested on powerpc64-linux-gnu P8 and powerpc64le-linux-gnu P9 and P10. IMO this is obvious, already committed in r13-4816-gfb73bfdb67789f. BR, Kewen ----- gcc/ChangeLog: * config/rs6000/rs6000.cc (rs6000_option_override_internal): Fix the location for OPTION_MASK_P10_FUSION flag setting. --- gcc/config/rs6000/rs6000.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.27.0 diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index eb7ad5e954f..88c865b6b4b 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -4369,10 +4369,6 @@ rs6000_option_override_internal (bool global_init_p) if (TARGET_POWER10 && (rs6000_isa_flags_explicit & OPTION_MASK_MMA) == 0) rs6000_isa_flags |= OPTION_MASK_MMA; - if (TARGET_POWER10 - && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION) == 0) - rs6000_isa_flags |= OPTION_MASK_P10_FUSION; - /* Turn off vector pair/mma options on non-power10 systems. */ else if (!TARGET_POWER10 && TARGET_MMA) { @@ -4382,6 +4378,10 @@ rs6000_option_override_internal (bool global_init_p) rs6000_isa_flags &= ~OPTION_MASK_MMA; } + if (TARGET_POWER10 + && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION) == 0) + rs6000_isa_flags |= OPTION_MASK_P10_FUSION; + /* MMA requires SIMD support as ISA 3.1 claims and our implementation such as "*movoo" uses vector pair access which use VSX registers. So make MMA require VSX support here. */