From patchwork Fri Apr 5 07:51:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 88070 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 EF1B83858402 for ; Fri, 5 Apr 2024 07:50:14 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2086.outbound.protection.outlook.com [40.92.75.86]) by sourceware.org (Postfix) with ESMTPS id EEB1C3858C24 for ; Fri, 5 Apr 2024 07:49:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EEB1C3858C24 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=hotmail.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hotmail.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EEB1C3858C24 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.92.75.86 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712303391; cv=pass; b=ZNtjE7o4CuC4oj9E27oLS2aNVr0v4VnLY3tcCVkuQwblpwJyw2CrGmqXuTyovVzos5nynLxMZxlYn7Neb7LTKHwrWyseYxsR8tTorgUvK5ILR9cR8i7NVHBXy7jbMtcMbK03vq/31/H+ChNLCv10qpEr1r1kcJwbSixez9jmoFU= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712303391; c=relaxed/simple; bh=VxTecsCuHAOrOJwyp/K9Jde1kr0U1HaU6LD0SXcWpyE=; h=DKIM-Signature:Message-ID:Date:To:From:Subject:MIME-Version; b=HkzFRO2U4uAWIVvMfrFFbGm/iNxRHyy7CJkvsj+fXsioTqIpwf+ofF7xozo5JQwRvrCCMpQgC4vLyD2w0Wo58qArlAIt3Xh8qd/j3+wPHCacDAKFiMQktoe72XSZ65+QNcx4NbNi4/UBQDTG7lNx/uswbSsnx0Ymbc2PuuavNsI= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIm1DR3R0x69W69+JYgfOgjeMM4kkXLQBuVwvbqmfbLbRtIZCFmXT9pnpYfMpSftl+Kgcu8oDqtaenjeBjDrb1YrSqggQr+4ORui3UUo4fOe44E6oiuXtwU8u99PxEjBDl9hQL/lNUlv8fMxMLeAgrlKuAYjkGk4xXG5ehKQmTumuoa/55KTWpoD+4q8fUylTRnubvTJzEfju+dOuAWUTVkbAiL/NoZxme67c1L0YzprsTMnxBYLfFQyStl5x2c3maIK7l5mvudyYPYWIvJS1DgdHO0izOI6uOXKXsxbQ8U7jCuabdARKiUA9pXJFFl1b3eF4aqdlI8qmQDNlt3lDg== 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=qspg2c7KaibhriDvdnThYeNVTtQDH8SMqVBhQn1c0p4=; b=DsJKi5Hd5ZDvtqUOHTL4ub+HD3nZYgB9SUVe2P/T8fZITms9fgBzoefdZzEALuRGFEzb3TAY2zO9eGKOOErKUov7aH/NTMNHNmxsig4K4Qf6VMbqzjYqphq6in9zF/C+gV6IIdraQIJCUlTPVBBxUG54itkrLZssun2hbEMVyYpwuLnxQVsjdZat/1mxBIfxflSTsUM+PC+/OAsQPapXW7RspCTOJxerQHP2+VYit9ZJAz/Jue5PXxHQJjgZnMyQcARHcSWvlqZiwXAYo3oOy7LZB1ZMoeOHVIxMC9a/YUR+T0WHchvSUpTNP38E3RFEtB2f9kKRfV32ONcv9XrAuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=HOTMAIL.DE; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qspg2c7KaibhriDvdnThYeNVTtQDH8SMqVBhQn1c0p4=; b=S6gUhNZfRhdBaFZEPhUWwLHbPeWSGgV2YuYKjJYwxsoe7yM5OlB1rTe4iYSGL4qFmPY4EfpdavdN1oonU0rqVAJhR8QPBj48tmg5lyl8cGERcVZThuQuELITFuW82Z3+KGH6fqgLhi83Hm2adXkqSWm4WxuAb3G903m+VrlkWvsbIzy2hcqqqk/ZjVxjvrZWOFUnbQss/v5W3pPN/19cGm4Fu9avca6IKOYXQnk0t3Jq5alJJOKe1Z0gJoyCT8Am++4P3P+iQ0e1jCCxi7ZmBXaeN0x7D6czxZZJ23bPiCiZb+MVbqbMOucUOXQUozHQyBK235Wf5qi8OKwuHpjh6A== Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) by PR3P193MB0665.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:27::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Fri, 5 Apr 2024 07:49:46 +0000 Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM ([fe80::5403:f1ad:efaf:1f71]) by AS8P193MB1285.EURP193.PROD.OUTLOOK.COM ([fe80::5403:f1ad:efaf:1f71%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 07:49:46 +0000 Message-ID: Date: Fri, 5 Apr 2024 09:51:31 +0200 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "gdb-patches@sourceware.org" , Jaydeep Patil From: Bernd Edlinger Subject: [PATCH] sim: riscv: Fix some compatiblity issues with gcc X-TMN: [8rFFXHJLze1DaRiQnNAxtdiaTvFVJVypNd5uhY2B5nqYc+ATNtfQIdiH1D3LVjWo] X-ClientProxiedBy: FR0P281CA0167.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b4::13) To AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) X-Microsoft-Original-Message-ID: <3776c0af-f65a-478d-929b-40315978a6db@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P193MB1285:EE_|PR3P193MB0665:EE_ X-MS-Office365-Filtering-Correlation-Id: 2bda95a2-b66a-4c93-5146-08dc5544f635 X-MS-Exchange-SLBlob-MailProps: Z68gl6A5j29W+MU02qkkn/ZwjkdLdtkEzq1HM8fhj+JY85BA4RwfYS/ippA6gkaaCPA3ezt0suqbQkhBzdFmQye2+jiXLdqa/jPkjcDVe7PECBZ0tsyFRp1l7mG1kvG3jNjzZ3S6freeewJQ/sMfQ++gFDa2T/y+e27FGBgMmht9ZVqGSTjaswYMbr+aNz1zNiKBZ4FsJAkHded6yDDuW0RhM08Y10uTXGdhOtBwCQJQAQt8Ix6MdQCJdfGDxA3euyxVR8+WZEBoR93tptnq9goWJgjh6tY4z8yQ3Mt94Pu+5GmC7r69ujzS9YIU3b5mkHW/JG4473vpvcpHLL0hGU58UxQq1rNZJwF/ZqFiqGJFkL6vDNM2NMHS9ancc1JO20hk2d9kBQutWzwoWckoc0oxQl58j5/gxLI7Mi7fSiiWGyQ4o7NDoWosglwGIDRBQ4JYBCFZ1w7y90AeALZeVYBNfnFFMUFyK3n+3U/HqoZ4JvqDNvaQdKTVhCypQLRIRsdTEr523OgMcn/xiFPV80OGnkSIt8XLyj2sJ8/ov9BJvkF0mllvbRhnLuO9+KeU8N8Wjm6KDGWD8RpqYOXdeHE2Cl7g1Tz8YxcJiU7JKGUU3vcGB05I+qMhCst56I46q50NWlyv6SPEZzM/iQFF6apQODeU8Z82lk3gZ7sQkgbaCsmzfuKMe77ti1pBw+NY+l9mqeBogoZMdHW1ca3oPaHYNB94PbLLiCKb24DxHnbEp0gfiSv5aEk7THhjHN8H1VxI9bZdvmKJQabMUxs49vJ1ZqPSUmS4yd2xiytIdHDNWMcSbB6uLIu7d3gRNjqw X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Drzrd1iicwjI/2gIGNvHwkfwwdvDWawxSmPKRSshlbE5SACxeaygrIJXUtl8X0WeuMqDGzo97efgNoQMoemWYtyHVi1nEM6zbuXLwLJEJhXZg5YEFB962OMxQRpTVJ8MxfPhiuJlemxGf59xJrbIG+EIoWckJnmBDOoZIlC+AhHktdHDMdjVCE+wimQI9WRGt/1IBcAkE65J5y/VkBD5j20uMxkE+5eq5hueWr4xzkXMSKAOY831f/YRJYTKhV+aCXKlzfASSyF1ksdR5xJofK84mSPk2xcjPyBfxdQOagr/Ulhq2PXTA3oSZ/BieEaA7h27fm2zWYefytf9RrlI0aeTQ8FUk7D4uhzYLNTHav1xEf5RYCv25dVkdgiF+SzLnOaFPb/m5Zz3T1c8Xz4XCNL/SG/6JVGX5kh5UBKu9JJQOh336mOr6jyt5H+pVjlB1UEFg4pWFfI/XGmremxhwE9TOrID4zBUtPUdaME1PbSvQLdY6GOC7t8+9zRoxQpK8tworl79p4VVzSnsfbD9JZojD/mqoghfik77bWviwO5xDEc/PCuCoWfO+zyJeOdcrSWFucpz5s/fFpQP5dx12jPKgw2IDZcz03m0Thd+YdKmGZ+EJGuglloTT8RCOOR9gQJen4NDYxdHTFfHL/lPAfEPufHf9lmtGxLiq1ZWnoY= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HCpD0kgZ8VFHHHuktIVBiJ8o2/Nc?= =?utf-8?q?ue6cM/qdnsiJ1YLy5uSwTLbnsnzveSuKXngpgFoHPlKxYSaIqdvYnpAMbhEu8/rj2?= =?utf-8?q?K2DeeW8fjMqnrzPEFiJzfwRCyev6cuU36psJgdfPsdcgDWa7gN+jURhQxL/08br72?= =?utf-8?q?XbG2BeVJ5udmxnnpafRrdeIBcsgcWSQeKtQinrFCAMQndn/y7Pz7dSW8bitD973Hy?= =?utf-8?q?AFhJKwv5H9aAv09+7vVhE00HV64N682gS1rJM7asvN48lPT2k7QP/Iop+q+Qn+o6N?= =?utf-8?q?q7R3acrxDmtOkMGh0s0lDgNiAo6mukm4PtTpJLja2rvXVTLxZlz1mER7fglw4Yz0+?= =?utf-8?q?dd4mFmQe1X193cH+U4276s5fB/mQH/lVCKkNgv/GD6zw1zT+P+jv8uTAUc0mGzIgV?= =?utf-8?q?KIJiUl+vHTWvHZvIfhb9Fb0wnYWKzRJv8V/wSc6IXiyaQtrzm/ZeMU6VEdSZ/RUIN?= =?utf-8?q?jcTJjAiEvKZDgQkctvaIRqaFAG+dho2WfrGlJ1hP/ybCjrCkq/pgWFhJMPk/grOXD?= =?utf-8?q?om+e8EsKm0bCZLaf8QZXhxBUyfO4JNM2yve73ohZlZk+6+45bUjdDEgT6oVTAp3sV?= =?utf-8?q?QdY0GJD0kZLvht8Jj8mHn1tHmHyiV2afiM6zimtL1xsRSjTAZSWdKDgTdof3Dz6RZ?= =?utf-8?q?b9KNkhUCQDIJ9vZ7MF1geMJwKJrDBfXBDa0SNtdQ9ncmNMYgXi3mz9Bghln10l5aa?= =?utf-8?q?5QVbCBR3czT7Ja40vP4X4conBTG5JX8XkaTHrZBtJNhLudSugAIo60pJSFrRrht2l?= =?utf-8?q?THEh0ekurtwuxRWVcknIyZN9erRrKTBT1ofvRpm1tcli/13y1AUjXFeoW3tlR+Ja+?= =?utf-8?q?VQCcbbBQtRdAJDRR3PwC/acHLw7FdRE64Wm2Zr2brILqCd3iuevrmLQPCzIkfzu+q?= =?utf-8?q?1X/9HUA2BNHOyOOj7401bF6Y5Obemr/RCYQFtXeIkCcsqkYxqw+a/1key1sVfNF3I?= =?utf-8?q?Ccz2/kzN0SdwnfIn+7r6hrYe0LOakwepFu+HuyS1WUjcLH5OWlh3ru8gDlwrtQ3OP?= =?utf-8?q?1zqkk7asUW1WJY0grUaCKbKI2OvU9OnHx41QNEnuch5bL2RYiQtndN6VISp1XSX8z?= =?utf-8?q?bw/apyynlqNY0o7I3RLpOMjoj3ptsn8js44dnN52rRIZkAV4xzZgAnD4WwaSx6BYQ?= =?utf-8?q?TVXufkx5jCztHUuxyGxkS7Qn9Nae5SktyG7TVzqa0eTc8mzzJHBsK86lbOGRWU1rm?= =?utf-8?q?CeOQVRBsbpSrzWCHaKR09wAdPiDvRUDg63qOVZZW1zQvCtYvI+XJZ13VZlzCEx5k6?= =?utf-8?q?/MOb198qEHBFasdd?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-80ceb.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 2bda95a2-b66a-4c93-5146-08dc5544f635 X-MS-Exchange-CrossTenant-AuthSource: AS8P193MB1285.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 07:49:46.0280 (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: PR3P193MB0665 X-Spam-Status: No, score=-13.6 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, RCVD_IN_MSPIKE_H2, 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This makes the riscv simulator able to execute a simple "hello world" program when gcc is configured with: ../configure --target=riscv-none-elf The first problem is that gcc generates rv32 code by default in this configuration, while riscv64-none-elf generates rv64 code by default. So change the riscv/acinclude.m4 to use the same logic here. And the second issue is that gcc does by default generate instructions in INSN_CLASS_C, so move the M(GC) to top of list, in riscv/model_list.def. Then there was apparently a confusion which cpu model uses JAL and which ADDIW. Fixed that in execute_c, case MATCH_C_JAL | MATCH_C_ADDIW. With these changes a simple c-prgram can be executed, however there is still work to do, since when the program does floating point operations, gcc starts to generate hardware floating point instructions, with no obvious opt-out option. Note the gcc test suite can be used to test the simulator in this way: make check-gcc RUNTESTFLAGS="--target_board=multi-sim SIM=riscv-none-elf-run" Now many tests are passed, except those which use floating point instructions. Fixes 3224e32fb84f ("sim: riscv: Add support for compressed integer instructions") --- sim/configure | 6 +++--- sim/riscv/acinclude.m4 | 4 ++-- sim/riscv/model_list.def | 2 +- sim/riscv/sim-main.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sim/configure b/sim/configure index 1ebef377973..fdc0a86d524 100755 --- a/sim/configure +++ b/sim/configure @@ -17479,10 +17479,10 @@ $as_echo "$sim_ppc_xor_endian" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking riscv bitsize" >&5 $as_echo_n "checking riscv bitsize... " >&6; } -SIM_RISCV_BITSIZE=64 +SIM_RISCV_BITSIZE=32 case $target in #( - riscv32*) : - SIM_RISCV_BITSIZE=32 ;; #( + riscv64*) : + SIM_RISCV_BITSIZE=64 ;; #( *) : ;; esac diff --git a/sim/riscv/acinclude.m4 b/sim/riscv/acinclude.m4 index 0c6290c9c08..e9953c1017d 100644 --- a/sim/riscv/acinclude.m4 +++ b/sim/riscv/acinclude.m4 @@ -15,8 +15,8 @@ dnl along with this program. If not, see . dnl dnl NB: This file is included in sim/configure, so keep settings namespaced. AC_MSG_CHECKING([riscv bitsize]) -SIM_RISCV_BITSIZE=64 +SIM_RISCV_BITSIZE=32 AS_CASE([$target], - [riscv32*], [SIM_RISCV_BITSIZE=32]) + [riscv64*], [SIM_RISCV_BITSIZE=64]) AC_MSG_RESULT([$SIM_RISCV_BITSIZE]) AC_SUBST(SIM_RISCV_BITSIZE) diff --git a/sim/riscv/model_list.def b/sim/riscv/model_list.def index b83557e5539..df9ec897126 100644 --- a/sim/riscv/model_list.def +++ b/sim/riscv/model_list.def @@ -1,9 +1,9 @@ +M(GC) M(G) M(I) M(IM) M(IMA) M(IA) -M(GC) M(IC) M(IMC) M(IMAC) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index adff99921c6..9c0d070aa60 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -1018,7 +1018,7 @@ execute_c (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) case MATCH_C_JAL | MATCH_C_ADDIW: /* JAL and ADDIW have the same mask but are only available on RV64 or RV32 respectively. */ - if (RISCV_XLEN (cpu) == 64) + if (RISCV_XLEN (cpu) == 32) { imm = EXTRACT_CJTYPE_IMM (iw); TRACE_INSN (cpu, "c.jal %" PRIxTW, @@ -1027,7 +1027,7 @@ execute_c (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) pc = riscv_cpu->pc + imm; TRACE_BRANCH (cpu, "to %#" PRIxTW, pc); } - else if (RISCV_XLEN (cpu) == 32) + else if (RISCV_XLEN (cpu) == 64) { imm = EXTRACT_CITYPE_IMM (iw); TRACE_INSN (cpu, "c.addiw %s, %s, %#" PRIxTW "; // %s += %#" PRIxTW,