From patchwork Tue Aug 15 18:46:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1821510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=u5np7tB4; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RQKxW51Rdz1yf2 for ; Wed, 16 Aug 2023 04:46:54 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8F78C3856263 for ; Tue, 15 Aug 2023 18:46:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F78C3856263 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692125211; bh=SvAfuVPX3XFezhw4VsGkbZssBQnu4s/dobpdxKGycHg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=u5np7tB47RuGNOGLPOSM4PaHKTByyrjM3W0bGVr7BuO7/CcErRNKopE/SE6kFa59P Q3KZ8m8TE2jz7MxssU61M7MX4yX+41riGzOu4u1SQ+ArAk6Il5wEsvFLrztPisrmpY CgREqeFdVThoriVBandZ+T4QArg2WxUoP6NgoUCA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id B1B523858002 for ; Tue, 15 Aug 2023 18:46:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B1B523858002 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37FHiKmK025848 for ; Tue, 15 Aug 2023 18:46:30 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3se2yfnc2f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 15 Aug 2023 18:46:30 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 37FHsekH006606 for ; Tue, 15 Aug 2023 18:46:29 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2042.outbound.protection.outlook.com [104.47.66.42]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3sey2deayr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 15 Aug 2023 18:46:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W521FFynPIy4dZVQKIzdpY0J5XoP32+uOIscL6eRLUU07qmb7FQQy76Ylv6yGsJCDLOqWYkvatnAZaUU3BjWBI8gTBjwgh7AyBv5fCRXltAtIMgYCqtqyZdirVnpQ/hOtTFRLRT6sEqBNOSCChZ6qThKsPtabzNe6IpPcXdCLS6+iNxQelYU1glOFeUmH4l3wqw0Vc6jweDO+lHliEgQpHWDMAl5SCU2xvAmwczCDN+bDYO7oVjTVkp+6mMdMf9WW5TYhP2ijLSBFXnEE0rh09nnMPeJCwV6Dhbb2qtcVpvzE0IvyrsE6Gupgy44ouSOwFbUB844JsBAeKODop4xOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SvAfuVPX3XFezhw4VsGkbZssBQnu4s/dobpdxKGycHg=; b=odH3GQQtHc9HG0TSDlQTxPc3KWU4hkjfuq1MePKnxFc55jD/MmIECO/l4Km7MTr2hVazPwt+bMk+F/3BVkzINp4BD4XoMVeSsMpJtc4Qt5JDpK/V5dhS6PajGOkwyB/cv8W5MXmDdT0Qsp/ea96yuJNnODnJDJGxFxXbi4REjAjSzAwWOj4Di66hQKaJkE8FMuaIsXFD8Jf9Cu1ux1v00EZKI4A7lW+r1O2VO9qzGQFdBBCyXN5q30DzI9M4lWKv+JtNvi/d7Hf+GhAJtca79yW+N87ZAdOZ49sHIFL1ccyqmx21yJCwrahMRuhv6lGrXKejk1p9Bdu87Et2B2Axew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by PH7PR10MB6604.namprd10.prod.outlook.com (2603:10b6:510:208::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 18:46:26 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::6269:77c6:e6b9:ac03]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::6269:77c6:e6b9:ac03%6]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 18:46:26 +0000 To: gcc-patches@gcc.gnu.org Cc: jose.marchesi@oracle.com Subject: [PATCH] bpf: fix pseudoc w regs for small modes [PR111029] Date: Tue, 15 Aug 2023 11:46:18 -0700 Message-ID: <20230815184618.7396-1-david.faust@oracle.com> X-Mailer: git-send-email 2.41.0 X-ClientProxiedBy: SJ0PR05CA0209.namprd05.prod.outlook.com (2603:10b6:a03:330::34) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|PH7PR10MB6604:EE_ X-MS-Office365-Filtering-Correlation-Id: 82a3d551-45b3-4600-9f17-08db9dbfeddb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 76qrHeeT73DMtwsgAAWfttBf3WDZ0V0TsbwZpg2k8n2NsvEkj8Ft5XwbnzwPhAZj+HXQom3OQ7iuEgsIazbOOGXGh6t8ZASHNHIoYPpMWbvtbBzWq4YIuCF6ctESMRe2kkxuuDrAL60D73agAyzSKiQ6T0DZ90vpXGxsBfKSkXpnN639KZjMldLsYGi3rAyetom056BZcBoghlQlLH+M++BINu6CEWQrGB1bVhjPvIgd5WN/YKr9w5B2I1aDaJXTRn1i+uuy+DAuv6NqG5yFKjRkn7NqwfQUcNj/nva6+PV5cVIq35/HOsjQQmvupOXG998jsQt1FBFBSrUUIraQYo6LWAuc/BvgM7DTHz+2eiz23dcZt1RIHGi/TNCPU9qHSivdgGb/a4npfwAwNqrtpY+K7LdQK4Mll4RISo9jD1R9X2NQgcsrxEweUw3YUuVu4/h73gGRw+LMcBzUyQ7WJv3ik5KrPHL8HCEZggGu0PtkLTCHFbgW1yp76YQAw+AC16qltwbFBr3qzcpkynY9a28t+WANlgz5QIWzA+ZrPCSC0eCtUN2Sabho4t+0K8Az6oi33NOCGXjLQ1jMPnOFlA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB3213.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(136003)(39860400002)(346002)(396003)(366004)(376002)(1800799009)(186009)(451199024)(84970400001)(83380400001)(2906002)(107886003)(2616005)(6486002)(86362001)(6512007)(1076003)(36756003)(38100700002)(6506007)(478600001)(6916009)(316002)(41300700001)(66946007)(66556008)(8676002)(8936002)(66476007)(6666004)(5660300002)(4326008)(44832011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LeB+QkAwtfWZefBPBDUxQOgPN0K62ezmRYL5KAW/dbhXHBmro+flk4QswQJS1h4CH8tWUZ63wSTOmtBakwJ8XucJWlQ88AD84N4jYJ7dlSbOpTNn+99U4k5wH22Xs0yzxaXJGOh4CjMiCNlBPBrBwHmF6lF8E8ZYbYUcwOdKvrF92ZXFSJqw6Dyuh8LK+2fWr/aCqIzo5lhGY3DyahLPBzUblbaTHx63qqZZqEK3cVtU7sQFv1oyoq1hz1Z5WNdlyCg4t7nmv7wEJ/eSvGQymFA5aS9k3WV6zMlF1N3tsXPEGJeRa+GAjbcNHqKGMR81AueMhYwXPMubMBvQp9m3NI1nlUnDNmwoX8kW0GqN2vgX96/Td7+zxZ2rpGZeurdbs96D4wKtSrrpwR0820Jx43e6kJU1sWL68nyEdFl+gAzodOV7Hu/SgIP3rOay0542gycNd1AyCiXdNB8nTskV3qCiAJR5nm5C+JauMX/odCZI2SYbd68krqIBMF0FzQT/2a22RdducrTPLjBm69Io9RKI27K4zoKRGeub2I7yA6vfrS9KfX3B+WqqaX/c3+vktw9S+rPE6r9vAxLyN3Xjo9fKFZ7dMdyY81V7g+0fDT+HZPzo0YeFJVF+tAWNvyw4hlf96ay7bR7//zAnRKQk2FS4Puy4aqsQwIRdDvom3uRPHPxOQexsyiAA/sGUb7DRN2eUoF8ULJ50dpX5DZNO43ME1xfmX9FYafqgGksiUYJmma/26Rd18yCZ5N2EY4z/01YPrKrAtvyF3/A6lpozlz5gFm8SqUummfjNm6SmmZyoQJPfRiLXx7aP+1q2/LGgaqq8fgdspUkLl8z574lhVsXrYsi+fzNmGt4/9upGeW/OoIsy+Stgtqmiya37MdlzyUcr4KX3e7P6BYzfrZKbXV/874Na3nvolBr8x7OXgV3y03IaJILX6IHbtRjJb1gM6QutfVroga5LdL02BYKodTPiHZUvx+durmPWlNTct8DnzXAI1mi+ybRZUDahe1W1bpODy5l1rCvCfV4IXGM05w/+wYrp/PqqsGUWLAVRE5taQi1W6fCfOZHoWufIgGb51VaFhhiF2x/qBPoVRIkMD7vMOCKZvTRl+jlMoJybAF8q7qR5fmMOHgQPUMzCu6iNswP8BTuVd6RLNGuNM8K0BuNDCOrel+CDLs3hjBKX/FrRWxg1hQDupvOgKlkFvOoUZsLTBB4emdyp/26/YA9+utOV5yKoxLIi1qGoiIQXBXN9Dv5QVZA7P917dfXlVL7ohkvImNYel3ep1IdpfO6x7LjH3CFstpnUh8yspd+yDOqhO/F/LxY3wDyuqNCAX/Hx0TVueJLkSCJeHsmQdZMVwsGPPBbYaUBf8VBNt3W4WTLkdCtDv86VK25LibS/wQSy/fViELONvxXUtQ2bCjsJVoALurj7Teig6zRSTYYq/NjFUyMWnSxzAsd+bmCRFRK44WGUgxZkeCjz7d3AOcxZCk8waOofZ73yD6kgCjjyaNKYWf2Iax/VQGuFMZX1FfPf+VLL06XNrFH7w+QgtFJu/nWVerj/GLGGjAbehvCCnusRSNlpz5EgBmeFKjlcjRrGf0Chn9d3Eo+fTiDiT+HEmbxfC8FfKYvrqKSGrO0gpeo= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5q7RUcqA45BxaViqL2n+rVm+Rrna4Q/0bLqK2YWcrvbuMbwZ2MqEXc6TzkiNc5AWZ1KhQNjDVcxZon2iGj3HyBQWSf1HJTvWWr/8nPN1XyLkEatlcLY8BXPcgf9OlrWAMoZ1AdZqgRoAM/oI9fZB+sxHB8aMwmWVXKuLeiOytVgU3XgmZcgMfg/tZwQOjiA6Cb25co8ph7FmEouSs5vob8A99R/NnCU+B93z6qhfVfDG/7TCdSPqna08vZ5zOsNupmZ189iajpJLtwQ4mqVdWH3BLc2vKMCXpG8Kqx1ITbAki5Ht57AAGZ9VKLK2HAvFE2wc/q19tU0mSJ092N52bE4YYnmNm77OmjDpWdBjjJkWmol7Q3wAC08gYy5rD5yNwHyDzpeaTmEnRnd/lLs7Qgd9fr2fhYY7qPjNgIPgNVG7AWNpU774c70wF9vNHfrwRs2r6/H7zHeU+cnxD9OfCjA4K6yfcR/RsIcEA5zd3bpnJJYi6MTvi4cjtT0rpvObH64v0yISgukC/Wqsv4vMuxkDYfujSqDJlgs5KANqS0L5aHdy38RQW8jbxsUNXvDXEd8Z20LHWEZEf/vmQ7B+/cesJAeMVkM8dN4YwthDQ6SO25iQ2drlgq4Ja4oz97F4+rde7jcEbcyAttdKXLtWZwiyAEyV/TsBNdOljc1JYBY+vqcw8zSUtWONS7CtrRN1KTBbrMQ//myOvWT7QwhYFnXt+oSh++ROglrqarmRcYuyGpwlNKzTHUSmiCcuYBQd X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82a3d551-45b3-4600-9f17-08db9dbfeddb X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 18:46:26.0216 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B5w5CiAfd54F08IGC9X/M99ptTTfB9A2AoCHpddZqq+pmebBUNot60zQmTAhJkNaGs7nl3Ch0gEoYcURIUIgCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6604 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-15_17,2023-08-15_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 mlxlogscore=684 bulkscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308150169 X-Proofpoint-ORIG-GUID: f752caqEar5WYu1Vo6jrRLbW0nz-R-bE X-Proofpoint-GUID: f752caqEar5WYu1Vo6jrRLbW0nz-R-bE X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Faust via Gcc-patches From: David Faust Reply-To: David Faust Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" In the BPF pseudo-c assembly dialect, registers treated as 32-bits rather than the full 64 in various instructions ought to be printed as "wN" rather than "rN". But bpf_print_register () was only doing this for specifically SImode registers, meaning smaller modes were printed incorrectly. This caused assembler errors like: Error: unrecognized instruction `w2 =(s8)r1' for a 32-bit sign-extending register move instruction, where the source register is used in QImode. Fix bpf_print_register () to print the "w" version of register when specified by the template for any mode 32-bits or smaller. Tested on bpf-unknown-none. PR target/111029 gcc/ * config/bpf/bpf.cc (bpf_print_register): Print 'w' registers for any mode 32-bits or smaller, not just SImode. gcc/testsuite/ * gcc.target/bpf/smov-2.c: New test. * gcc.target/bpf/smov-pseudoc-2.c: New test. --- gcc/config/bpf/bpf.cc | 2 +- gcc/testsuite/gcc.target/bpf/smov-2.c | 15 +++++++++++++++ gcc/testsuite/gcc.target/bpf/smov-pseudoc-2.c | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/bpf/smov-2.c create mode 100644 gcc/testsuite/gcc.target/bpf/smov-pseudoc-2.c diff --git a/gcc/config/bpf/bpf.cc b/gcc/config/bpf/bpf.cc index 3516b79bce4..1d0abd7fbb3 100644 --- a/gcc/config/bpf/bpf.cc +++ b/gcc/config/bpf/bpf.cc @@ -753,7 +753,7 @@ bpf_print_register (FILE *file, rtx op, int code) fprintf (file, "%s", reg_names[REGNO (op)]); else { - if (code == 'w' && GET_MODE (op) == SImode) + if (code == 'w' && GET_MODE_SIZE (GET_MODE (op)) <= 4) { if (REGNO (op) == BPF_FP) fprintf (file, "w10"); diff --git a/gcc/testsuite/gcc.target/bpf/smov-2.c b/gcc/testsuite/gcc.target/bpf/smov-2.c new file mode 100644 index 00000000000..6f3516d2385 --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/smov-2.c @@ -0,0 +1,15 @@ +/* Check signed 32-bit mov instructions. */ +/* { dg-do compile } */ +/* { dg-options "-mcpu=v4 -O2" } */ + +int +foo (unsigned char a, unsigned short b) +{ + int x = (char) a; + int y = (short) b; + + return x + y; +} + +/* { dg-final { scan-assembler {movs32\t%r.,%r.,8\n} } } */ +/* { dg-final { scan-assembler {movs32\t%r.,%r.,16\n} } } */ diff --git a/gcc/testsuite/gcc.target/bpf/smov-pseudoc-2.c b/gcc/testsuite/gcc.target/bpf/smov-pseudoc-2.c new file mode 100644 index 00000000000..6af6cadf8df --- /dev/null +++ b/gcc/testsuite/gcc.target/bpf/smov-pseudoc-2.c @@ -0,0 +1,15 @@ +/* Check signed 32-bit mov instructions (pseudo-C asm dialect). */ +/* { dg-do compile } */ +/* { dg-options "-mcpu=v4 -O2 -masm=pseudoc" } */ + +int +foo (unsigned char a, unsigned short b) +{ + int x = (char) a; + int y = (short) b; + + return x + y; +} + +/* { dg-final { scan-assembler {w. = \(s8\) w.\n} } } */ +/* { dg-final { scan-assembler {w. = \(s16\) w.\n} } } */