From patchwork Thu Oct 27 10:51:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongchuan Tan X-Patchwork-Id: 59515 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 75BCC387688F for ; Thu, 27 Oct 2022 10:51:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 75BCC387688F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666867905; bh=9cD4CreUQkEjwj1HoTkqMk2aynMviybtMitx8hHOk2A=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=H3YNJnChR1z00+SbvwngfTW0zKWgoirNaog1SH6tQBcOPqsWrpnEXeGr+dSybmTtL uZDHEbBGIB4ygn/qaUxeDyUy/BtRWcoOqqJ9jrbi66pUQPqkn8CFssbrLcYjLI5F/d oF6/K4sJ8GWrZeZlPfB2HETfT59KmIerMYOmmC/g= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2021.outbound.protection.outlook.com [40.92.98.21]) by sourceware.org (Postfix) with ESMTPS id 9BFC0385380F for ; Thu, 27 Oct 2022 10:51:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9BFC0385380F ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FLa6kVfK8A+0uDpwC6EJltOPfBnsnsk9syF8AF+uU9n/TFUha9wsnGrGjXhuAjylKqnXaP3wnSMeDfICmGo4ELreKXg4Ug/eGUWl+D6DwYNfsvo190FUAGHGkPLd9VlYjdjukCZNUgAjx6HmbYtUh8Ucw2eickEf9XJBO7Oi1G1trBrFAcIlayb2J1y+6DNXaacRtHoNkBuOLZnsU+m46EZcVsDbK1A2I0L+xwl2wkA/mrqqAntcUmZvK0Co6Sq7TiISM4Fq6OqPjnJvWsjh9yQAjP/R0LEhN94LGwPx30wf1W3HBU4p1xQTw2Z1xMaBJWsff9sfCtsAtYcJY3oC+A== 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=9cD4CreUQkEjwj1HoTkqMk2aynMviybtMitx8hHOk2A=; b=Wk728Bu9UoS8cvXEVW8Ezqjx6roBOxDIr9dX0g/GmyBmG//SxpbxzsTpaPTWat+FLcCI65mTPDSv4LPbHaBpAUEQoMIk6SNXMecXDNUPV+9Cc0CBkwDoDxVVUj6F1UJ4waZ8Tv+CQPgXXeI0rmo+Pvze2kW5P6f6NfU1+s+j48yi6b9JHn7kYG+t0VxRQsY6IBQPuNbB/T6EXOQSk6pVNbPTeWo1aXaf4NoKdbwfJvLpdmDXfOXZYgR6wGv2h8nmobdwz5YThgaePmiNN71/s+p4PerxmgCP3KFcUN5I0X6BsqzZeEtpYL6o/5YqZKp84Oj+Vr25LxkUY+pswcGAFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from OSYP286MB0261.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:8c::8) by OSZP286MB1703.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:1bb::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 10:51:09 +0000 Received: from OSYP286MB0261.JPNP286.PROD.OUTLOOK.COM ([fe80::8ed2:bcf9:f9d6:7976]) by OSYP286MB0261.JPNP286.PROD.OUTLOOK.COM ([fe80::8ed2:bcf9:f9d6:7976%7]) with mapi id 15.20.5746.028; Thu, 27 Oct 2022 10:51:09 +0000 To: gcc-patches@gcc.gnu.org Subject: [PATCH] RISC-V: Libitm add RISC-V support. Date: Thu, 27 Oct 2022 18:51:24 +0800 Message-ID: X-TMN: [zW+Vfpm6xqoNN1gVrwS90zsTwj++3O5P3mRBm2w8U2m6A7A5ChgScxEy9+hdajmO] X-ClientProxiedBy: TY2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:404:e2::20) To OSYP286MB0261.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:8c::8) X-Microsoft-Original-Message-ID: <2449172.irdbgypaU6@koishi> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSYP286MB0261:EE_|OSZP286MB1703:EE_ X-MS-Office365-Filtering-Correlation-Id: cd92c1ff-da34-4f81-66a9-08dab8092815 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RgsHtxhGpJaKXMAVmua/q5K1rUTHp1ufzNGcz33mzWnc6hFPODV1XcHjPlNU5LYH93E3CTcb2uog8P1UEZXFoK4OKUdyfTyqejq89o8IsV4ejusBh7cyn1DTweJkghN3y9wcW4gMZze3k8vNr67EeLRuPyjBNTTMpOXFuPlpaA/0JE+dncMcBFv6uBxli7aM26Z+qQMIQhjNdRLggPLsLXkWu+3vzcviwaGLIAM3FwA+hgURJWxuLD33QCoYTGv+ZzF7X+R0qrgdHPDC1Y/iDXYzCK8D3RH16svpgMSorbUFGQXTGy0UK9OMq8dWfYLXMaVC84rkzCscsK97hv0k3uLphfOFqnQghzjRXFQ3gujiciomVq5EBbVTd3LwZAGHipPV9XRD4/7Ku0FaVAs6+aM8Gmq8lJLOTIYf3WkUIfQ433CZ0+S4W4QnSL/MO5VGulKBrYvlFyZ6voNPEswjysl8JdNFDZ8LCEs3rVt82S6nBQ/YG/sGMUHe/sKNRmpFQCC67vkaRPVytSMEvw+Mt31qA3zJrB7bEiq94DKfOwuyCQkHQ04aI01gdg5V3sYvgrbRKvfJz/2f9HEnNViE8NMjEDezQWLCANMB4A8VQC3PkTjjk1RQ7yk15uvPVR9+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EZ2FC1OSBAnJ4V/yhOVB6VcXF1FKvH3sBfZGJp2a0HPy4qZdQrJ+MJXkiQ2Vtb9GwudfqyrCN8ue5X6B4gpkeoJLgSPxuI2Zn3PfGFdDlpBkB8RqOKXuF4u7TxqbF16cviKj4xSKZbAERzwhXC+se7OqQxvi+9349Yr1EPEJLpBp3a8IApRfbpc6G0jyHR9hMp87/kGqVNawlv6JnjMQmegcEnQ7sYkQ/ehjPndq1jKlmbWWk8ICMg2efbG2T+MH7MSNELqho6FYs2RJNH6/Uh6eHt5bW4NjhRWbMK2GvzQ6dbadNa3lEN37kmGa4uQ2xvEbdNyjMlo/uzUc2FNuhyGBdmKJbCnhg5/9KB1EiwR50qEA1ismjBH9q9mkGs3SllBP4zV4m0rJtuit9M4cOMIEnqG+wYalqDrwt0V3kttY7tJjCgeJlRixDeZbseprMwLpNXajfQstRq9vZI8M+BQF54dsSzQ21DSTunVpiLbbLdFliDPV6Gp0Q1tY+KRgBmd6NjjoJYF/DP4fpCHYZ47JC1Cbi63ENIHwpwAmoR/35tQ5/bSHBnMQTXiHIBvAI4D1XmFiLEMU+DtGL16M2mirM68cw6cPD/+uNtbdBwbERzI0y6KWKs+RPdeTs0JEwHiO9R3OzQQwg8+oDAdBfQ5H51Ef6JgMfUj3B7lbcbY83wmVOBVUFlEYF8+AxufC8aRa1nibBOMEMzOLxM5py6MOzOJmesJiW71c8F/AuFHK/VXGcHLpVYSMHMplMQRTbKIKMx/F915bQFFahBBPuXoa7TPBoaYywKIzjSV6f+TF4KW52r1DK3AaxIQq9/LS9gS/OavISv5mfHpg4QBAVezeWpPgb4s9TiQhtRHgIOKqFVA7b/MazHiyb9GFTo5IyLA3ZrRXuFZv+HlSZczOjaLMHu/ef8fYpoLkhxB3nqjvtSfJnFDEPznvJaeMvXmj/dw6gb4uJANJzQQEPrw8C9q1c3ippYZedZ822rJstbpsr7EtJmaSaySWJ14KUbDF59zE+W0r6fMsIVPswPFXzYWa1WFsOWKlmjYHF9uQFm9wb0e88RfcAE9GjqAg9KK339ulAr05DBl0ss7/AtvC3x7Q5zRRI02CD72JeIhd2OodDI4G2Qu3n9/lMF/5ZheYp/kAEvpPqsPbkDzlmdu0eKWYx2kno6BqhKEqWc4BhP8YfLzuLMNHCpDNDG1xsIaILLxASUJ9VxuCXZ/eaa/fx0fWpMYnpzLnJLlVo7MZRuh+KEqAK1ysKS2wmgr853jpYdpyVELZOzpzmRR+sWz0ARIX333HLHX+Guery9to5qfkqPn5p7AGNpw13gevjdlhWtUx78Am78qOKvImiCcyyw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd92c1ff-da34-4f81-66a9-08dab8092815 X-MS-Exchange-CrossTenant-AuthSource: OSYP286MB0261.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 10:51:09.4460 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB1703 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, 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: Xiongchuan Tan via Gcc-patches From: Xiongchuan Tan Reply-To: Xiongchuan Tan Cc: fantasquex@gmail.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" libitm/ChangeLog: * configure.tgt: Add riscv support. * config/riscv/asm.h: New file. * config/riscv/sjlj.S: New file. * config/riscv/target.h: New file. --- libitm/config/riscv/asm.h | 52 +++++++++++++ libitm/config/riscv/sjlj.S | 144 +++++++++++++++++++++++++++++++++++ libitm/config/riscv/target.h | 50 ++++++++++++ libitm/configure.tgt | 2 + 4 files changed, 248 insertions(+) create mode 100644 libitm/config/riscv/asm.h create mode 100644 libitm/config/riscv/sjlj.S create mode 100644 libitm/config/riscv/target.h diff --git a/libitm/config/riscv/asm.h b/libitm/config/riscv/asm.h new file mode 100644 index 0000000..6ba5e2c --- /dev/null +++ b/libitm/config/riscv/asm.h @@ -0,0 +1,52 @@ +/* Copyright (C) 2022 Free Software Foundation, Inc. + Contributed by Xiongchuan Tan . + + This file is part of the GNU Transactional Memory Library (libitm). + + Libitm is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + Libitm is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +#ifndef _RV_ASM_H +#define _RV_ASM_H + +#if __riscv_xlen == 64 +# define GPR_L ld +# define GPR_S sd +# define SZ_GPR 8 +#elif __riscv_xlen == 32 +# define GPR_L lw +# define GPR_S sw +# define SZ_GPR 4 +#else +# error Unsupported XLEN (must be 64-bit or 32-bit). +#endif + +#if defined(__riscv_flen) && __riscv_flen == 64 +# define FPR_L fld +# define FPR_S fsd +# define SZ_FPR 8 +#elif defined(__riscv_flen) && __riscv_flen == 32 +# define FPR_L flw +# define FPR_S fsw +# define SZ_FPR 4 +#else +# define SZ_FPR 0 +#endif + +#endif /* _RV_ASM_H */ diff --git a/libitm/config/riscv/sjlj.S b/libitm/config/riscv/sjlj.S new file mode 100644 index 0000000..6f25cb5 --- /dev/null +++ b/libitm/config/riscv/sjlj.S @@ -0,0 +1,144 @@ +/* Copyright (C) 2022 Free Software Foundation, Inc. + Contributed by Xiongchuan Tan . + + This file is part of the GNU Transactional Memory Library (libitm). + + Libitm is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + Libitm is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +#include "asmcfi.h" +#include "asm.h" + + .text + .align 2 + .global _ITM_beginTransaction + .type _ITM_beginTransaction, @function + +_ITM_beginTransaction: + cfi_startproc + mv a1, sp + addi sp, sp, -(14*SZ_GPR+12*SZ_FPR) + cfi_adjust_cfa_offset(14*SZ_GPR+12*SZ_FPR) + + /* Return Address */ + GPR_S ra, 0*SZ_GPR(sp) + cfi_rel_offset(ra, 0*SZ_GPR) + + /* Caller's sp */ + GPR_S a1, 1*SZ_GPR(sp) + + /* Caller's s0/fp */ + GPR_S fp, 2*SZ_GPR(sp) + cfi_rel_offset(fp, 2*SZ_GPR) + + /* Callee-saved registers */ + GPR_S s1, 3*SZ_GPR(sp) + GPR_S s2, 4*SZ_GPR(sp) + GPR_S s3, 5*SZ_GPR(sp) + GPR_S s4, 6*SZ_GPR(sp) + GPR_S s5, 7*SZ_GPR(sp) + GPR_S s6, 8*SZ_GPR(sp) + GPR_S s7, 9*SZ_GPR(sp) + GPR_S s8, 10*SZ_GPR(sp) + GPR_S s9, 11*SZ_GPR(sp) + GPR_S s10, 12*SZ_GPR(sp) + GPR_S s11, 13*SZ_GPR(sp) + +#if defined(__riscv_flen) + /* Callee-saved floating-point registers */ + FPR_S fs0, 0*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs1, 1*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs2, 2*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs3, 3*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs4, 4*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs5, 5*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs6, 6*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs7, 7*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs8, 8*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs9, 9*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs10, 10*SZ_FPR+14*SZ_GPR(sp) + FPR_S fs11, 11*SZ_FPR+14*SZ_GPR(sp) +#endif + mv fp, sp + + /* Invoke GTM_begin_transaction with the struct we've just built. */ + mv a1, sp + jal ra, GTM_begin_transaction + + /* Return; we don't need to restore any of the call-saved regs. */ + GPR_L ra, 0*SZ_GPR(sp) + cfi_restore(ra) + GPR_L fp, 2*SZ_GPR(sp) + cfi_restore(fp) + + addi sp, sp, 14*SZ_GPR+12*SZ_FPR + cfi_adjust_cfa_offset(-(14*SZ_GPR+12*SZ_FPR)) + + ret + cfi_endproc + .size _ITM_beginTransaction, . - _ITM_beginTransaction + + .align 2 + .global GTM_longjmp + .hidden GTM_longjmp + .type GTM_longjmp, @function + +GTM_longjmp: + /* The first parameter becomes the return value (a0). + The third parameter is ignored for now. */ + cfi_startproc + GPR_L s1, 3*SZ_GPR(a1) + GPR_L s2, 4*SZ_GPR(a1) + GPR_L s3, 5*SZ_GPR(a1) + GPR_L s4, 6*SZ_GPR(a1) + GPR_L s5, 7*SZ_GPR(a1) + GPR_L s6, 8*SZ_GPR(a1) + GPR_L s7, 9*SZ_GPR(a1) + GPR_L s8, 10*SZ_GPR(a1) + GPR_L s9, 11*SZ_GPR(a1) + GPR_L s10, 12*SZ_GPR(a1) + GPR_L s11, 13*SZ_GPR(a1) + +#if defined(__riscv_flen) + FPR_L fs0, 0*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs1, 1*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs2, 2*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs3, 3*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs4, 4*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs5, 5*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs6, 6*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs7, 7*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs8, 8*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs9, 9*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs10, 10*SZ_FPR+14*SZ_GPR(a1) + FPR_L fs11, 11*SZ_FPR+14*SZ_GPR(a1) +#endif + + GPR_L ra, 0*SZ_GPR(a1) + GPR_L fp, 2*SZ_GPR(a1) + GPR_L a3, 1*SZ_GPR(a1) + cfi_def_cfa(a1, 0) + mv sp, a3 + jr ra + cfi_endproc + .size GTM_longjmp, . - GTM_longjmp + +#ifdef __linux__ +.section .note.GNU-stack, "", @progbits +#endif diff --git a/libitm/config/riscv/target.h b/libitm/config/riscv/target.h new file mode 100644 index 0000000..16ee3f1 --- /dev/null +++ b/libitm/config/riscv/target.h @@ -0,0 +1,50 @@ +/* Copyright (C) 2022 Free Software Foundation, Inc. + Contributed by Xiongchuan Tan . + + This file is part of the GNU Transactional Memory Library (libitm). + + Libitm is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + Libitm is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + . */ + +namespace GTM HIDDEN { + +typedef struct gtm_jmpbuf + { + long int pc; + void *cfa; + long int s[12]; /* Saved registers, s0 is fp */ + + /* FP saved registers */ +#if defined(__riscv_flen) && __riscv_flen == 64 + double fs[12]; +#elif defined(__riscv_flen) && __riscv_flen == 32 + float fs[12]; +#endif + } gtm_jmpbuf; + +/* ??? The size of one line in hardware caches (in bytes). */ +#define HW_CACHELINE_SIZE 128 + +static inline void +cpu_relax (void) +{ + __asm__ volatile ("" : : : "memory"); +} + +} // namespace GTM diff --git a/libitm/configure.tgt b/libitm/configure.tgt index 4c0e78c..635c1d4 100644 --- a/libitm/configure.tgt +++ b/libitm/configure.tgt @@ -82,6 +82,8 @@ EOF loongarch*) ARCH=loongarch ;; + riscv*) ARCH=riscv ;; + sh*) ARCH=sh ;; sparc)