From patchwork Thu Aug 31 20:30:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719028 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp689439wrn; Thu, 31 Aug 2023 13:32:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzs5ycXfwnNgELKZJS7FlJhz9RUzsQLMBaJpPwFAweJfl8IdSHBRu0Z7LXSJDvvc6QQLnI X-Received: by 2002:a0c:cc13:0:b0:64f:6d49:9e4 with SMTP id r19-20020a0ccc13000000b0064f6d4909e4mr272638qvk.44.1693513977052; Thu, 31 Aug 2023 13:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513977; cv=none; d=google.com; s=arc-20160816; b=OWjmbyOsuRzT2vAvo8jIJR6UzaVclOhoRFAdhnGxYmyXab2q2l/wQ1+96J/g1X8Ii3 uElZ0+G4h1LYSYdjr5R2P4y/SgS1ciGnPNPBrT9mq32pgYrBsMet7foWy+36UF/Yv2tn cQ8YI58pE6Ew0nLGWaqAvlTIsmiPQlCYfaL/xHPKIOYziaKgiymSiuP7vuSbSt3oCqSf 67lzrapd9NZ/aFjj+dCt6ivWdoRUvmhSQFW9ogJvfrCSHSWHJ5z5rojYpfPSzMrrMQPm Dor6nH8lBrIOQSLJyA71jp96mF40stwkxIUO46fTV1quW/bzr+EacXJmT7rZzo3D2/2H BeyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4v4pNCupIU5kKxCqNO3QPDjJEZxzCp5Jcv4RC0vKsz8=; fh=YKYr15Cgu106w3RRe41KoUOQ3a0lu60aBMjOEvkqLWU=; b=hVUDc3ncc8X4zjjTX692GGNAX7YiPB2kiacdx6hQnUxULbafp2bl5gFw1sluCS/I3H YrX36jpSa4frUuR+sVjuATiqPH5AWhURl0b89YQliBkQ2hc6uDOYK/dNY7u66aWeqgUP K6hmRXK/827f74rcXWp7LQXO5WVXLcBENtDiGh8tityC6NNiUqwDu8a8aL68LZvRVZcU QMwIi3hdA83AqXEEE2ojjUTPAiCDaKdblKDFav+fYmUDlDtxLBQRse52AFeIfqGwC67m qZOhECStE6EAiwqnI3Jl05ttnV/Zj6fQokwfbeLtxFuoA+UYDETibGSobcmlJ3XMXZVc HXdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WWfOT1BG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k9-20020a0c9709000000b005ef676dbf8dsi1332220qvd.96.2023.08.31.13.32.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:32:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WWfOT1BG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJa-000083-LC; Thu, 31 Aug 2023 16:30:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJH-0008WN-Sq for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:36 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJF-0002c6-Nl for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:35 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-9936b3d0286so158530166b.0 for ; Thu, 31 Aug 2023 13:30:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513832; x=1694118632; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4v4pNCupIU5kKxCqNO3QPDjJEZxzCp5Jcv4RC0vKsz8=; b=WWfOT1BGMHy2ij52RDMP32HeiW+za9rchDZoK1sYObGtr105B+d7RS5EL9GHTDkXX/ hKhYqiYPUrtc/d+3UTKefHch4/voZi3s3mbhS85mvudf06ojVlPmJbG7mbQAcCe117Vt dKh+bM520SAvkcZz14Y3UC/PD57FaSDBwBCe/D2p4m0aF3GcDKA9NjG1wSRYQIFAhnT5 qU/U7ewkF+4JMZFOQfMPLVLw9uEZjJKOax6LSM9rX/WXAa9/Vg4Gv+udIngzJ5eJKMEG h/Auf5TRtVoPNcB6q77Lh7O3my4o5kBY2CrMf3mtomZ8wwyjnRFo2YPskvuCqnlqjs+H 6C6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513832; x=1694118632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4v4pNCupIU5kKxCqNO3QPDjJEZxzCp5Jcv4RC0vKsz8=; b=OYqhNFufFH4myYKiHuj/ugFessl3wGt9D/76OoqIMW6uTwVtdPcotL+N6zHMrIZfeL QUq8Flx1QsNKy5r6Go2DC2R6pH+SGD0bqFY4jE1fe1HPh9yIvSU9ZMXSPCOOemia4pyg 8W+wYY3HXnb0NMoyTrkkY8q7rZnjX8gYYj1JyBfHfiuhSVmrM9NJr/vYZdbgO28cejMg WZj1oRQw+oBWAqHSZrH4m3nQGYwQsJyFnktbZnd5+8Ki468Bz6KF96WpUYJ14oRDAY91 RHm+HQVMKxns6/ud7irt60rS831fKWkKYFZiuGt219csf/BiM2MusQ4kMQrmbFfUJjN1 fUgg== X-Gm-Message-State: AOJu0YzJPz7zqaY4rVfOtvgnWK9TgWjV5aPm6rygO1LeromEgS7Ousrq YkgkQAAuKNQLdYCmUHfArq1QPWp7adp/1xajQjo= X-Received: by 2002:a17:907:6087:b0:9a1:db97:62a1 with SMTP id ht7-20020a170907608700b009a1db9762a1mr296331ejc.46.1693513832176; Thu, 31 Aug 2023 13:30:32 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id z15-20020a17090655cf00b0098dfec235ccsm1131941ejp.47.2023.08.31.13.30.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:30:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , Richard Henderson Subject: [PATCH v2 1/7] target/mips: Simplify Loongson MULTU.G opcode Date: Thu, 31 Aug 2023 22:30:17 +0200 Message-ID: <20230831203024.87300-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=philmd@linaro.org; helo=mail-ej1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since MULTU opcodes don't record the most significant bits of the infinite result, sign-extending the sources make no difference in the result. Once we remove the sign extension of source registers, MULT and MULTU are identical (as are DMULT and DMULTU). Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 9bb40f1849..e0a76b9432 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -3625,8 +3625,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, break; case OPC_MULTU_G_2E: case OPC_MULTU_G_2F: - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); break; From patchwork Thu Aug 31 20:30:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719027 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp689438wrn; Thu, 31 Aug 2023 13:32:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFoXXnkHtvakX8RA8sX+9gIpmyz97XWMPB+GDlyfl5Vtzm78cvpFqmxJ/yR6llYG/3aZi1 X-Received: by 2002:ac8:57d3:0:b0:403:780b:6138 with SMTP id w19-20020ac857d3000000b00403780b6138mr658250qta.2.1693513976872; Thu, 31 Aug 2023 13:32:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513976; cv=none; d=google.com; s=arc-20160816; b=D0MdRmQ2v0got991hOHsE7iSuVl+gj1Bz68+9mPAEW94yp9POKRotTfQNVRcW2f9pa I3hC39K0ppqOE3GA0Svrt51jvcrTNOy4h0iCNLBGfV6oXN9IH1hkV6GAq5OZItsLJU7O cJYcw97CqW3PxmIJEQHE7ps/rm8OX5jz5TK/D6B1+SSKbEcjHqYgVXIpq7TjdZEsbwN1 2vgwDxFWzmyeyu2LOWzDWlsJX5pwZMkaxDIGiVVC0t8iho/BoIL05r4/BXQAlVsdBvYH s8ncFUQNO8yYySYBWhF8zAyULy1KQmy2oAFE2OWOJlrcqsfhLabQEc1U1vpHVxFhrDN6 EJ3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Xt4mTysv3p0TkH7ZBMFPgfml88juYpaBcKIPdaYgYYg=; fh=uqqN3Fbv51XqPrC7PTK9G5TuXPUMAXaAn7vWZ4VdhFU=; b=ntwIYN7HvFwccOtR/zn9gu4LeM8JxmxEj8g9jiUzjTJCYCIO4KdYaltqI+iV/hCT25 pKIEQLZJBpZRtloqzjqFx35XVjOGcv4XyvV8zmq00znkpl1mKYAkfJ29ewKPzTDXiwJl /80nRlS4Ii1PlzOdfL/ErJtM7fz+n2lNROQz5ZlkM8pD+f0hWQH5r3iNJkQO5RzRxqOu eeez5logiP5OvoC1g3lyXjfDVFLu6BkImJzCrxRgpboo6OvZPxbssu2kDwZka+TjHT6H dBKF9a2OLVIQZVMSQfjxF9SFv25kzzxJLNxSgGNKU1ycmp79fZyqBurs5Z6xkmr/vgJC W9jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hcfKZ7K+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n15-20020a05622a040f00b004009a10dcd0si1398962qtx.160.2023.08.31.13.32.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:32:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hcfKZ7K+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJa-00007z-IA; Thu, 31 Aug 2023 16:30:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJV-000076-8r for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:53 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJP-0002dU-T4 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:48 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9a2a4a5472dso519741366b.1 for ; Thu, 31 Aug 2023 13:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513838; x=1694118638; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xt4mTysv3p0TkH7ZBMFPgfml88juYpaBcKIPdaYgYYg=; b=hcfKZ7K+63yiFSgzsMCHnh6HiSzFm2T7/USVRdwE2RSwv6/ENxRBkP1Oeya0ebG/pY kfZPjTj+Bc5jdhMB1G4lDjqIaERdVnYkfwOKgxt/n78stsWDju3gJgAyZvac86fhu2/T KGVubAKpu1LLyssDQXoMT7uniCJQTYhV9it0mquPOXGgrUa3ma5wg2xGPgFnSbOVZD/B ApUe1yW3R2JDej+ERr8Z36KhMIEqqhNXoKJi5q6yg+zSvdqmqW2zswJ882PBuE2svCsf uEFKd8L6nF2Khd+FndOFkiP9MVprf+Kp81wCrOqDaHIEAg0kghioRbLz0B9+IdWTXqfN CXsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513838; x=1694118638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xt4mTysv3p0TkH7ZBMFPgfml88juYpaBcKIPdaYgYYg=; b=NWHlN8xSyDmg0JZOIcTpMUT7TS7vamAp2VK8a77R+W/STm/iqlgVTTneDx8Sy72r0D eE+wK8WILjt1bI5ysFp5dlQ0IN12dGphYKmq/pn08NGEl+HSy2INwVqmUU2r5qWzMTIF Nz+wL0S8ZQNY4+MMuhqYUXMYEkqvQFqDrsbIzMmEme2wIU9+zKv3HCx9diW45rQ5Zibj 1FXY1mA3qb0/Z5w0UzZewxajjlUpn19CUaSaI6dZ3f11svwrwR5daSPJAloossMfizdU e0ErCNpw2OEZWxG9+tPr2hCFX20PgPdjaLLjDqC1h4oqpCvnKdp1GMTnMAtHE2Q/9NVx vU8A== X-Gm-Message-State: AOJu0YwR7tOdf7b88Ta+oj9zdKd6jv06VGwPI48euqjKIfmvZ5T61jqp SugVcoscRV0MzDJaY1nY19K6KgvDKCmqr8/xu20= X-Received: by 2002:a17:906:518d:b0:9a1:b33a:e464 with SMTP id y13-20020a170906518d00b009a1b33ae464mr1054017ejk.31.1693513837722; Thu, 31 Aug 2023 13:30:37 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id lo6-20020a170906fa0600b0099bd453357esm1113064ejb.41.2023.08.31.13.30.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:30:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v2 2/7] target/mips: Re-introduce OPC_ADDUH_QB_DSP and OPC_MUL_PH_DSP Date: Thu, 31 Aug 2023 22:30:18 +0200 Message-ID: <20230831203024.87300-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=philmd@linaro.org; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé There is no issue having multiple enum declarations with the same value. As we are going to remove the OPC_MULT_G_2E definition in few commits, restore the OPC_ADDUH_QB_DSP and OPC_MUL_PH_DSP definitions and use them where they belong. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson --- target/mips/tcg/translate.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index e0a76b9432..19e73aea60 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -390,16 +390,14 @@ enum { OPC_ADDU_OB_DSP = 0x14 | OPC_SPECIAL3, OPC_ABSQ_S_PH_DSP = 0x12 | OPC_SPECIAL3, OPC_ABSQ_S_QH_DSP = 0x16 | OPC_SPECIAL3, - /* OPC_ADDUH_QB_DSP is same as OPC_MULT_G_2E. */ - /* OPC_ADDUH_QB_DSP = 0x18 | OPC_SPECIAL3, */ + OPC_ADDUH_QB_DSP = 0x18 | OPC_SPECIAL3, OPC_CMPU_EQ_QB_DSP = 0x11 | OPC_SPECIAL3, OPC_CMPU_EQ_OB_DSP = 0x15 | OPC_SPECIAL3, /* MIPS DSP GPR-Based Shift Sub-class */ OPC_SHLL_QB_DSP = 0x13 | OPC_SPECIAL3, OPC_SHLL_OB_DSP = 0x17 | OPC_SPECIAL3, /* MIPS DSP Multiply Sub-class insns */ - /* OPC_MUL_PH_DSP is same as OPC_ADDUH_QB_DSP. */ - /* OPC_MUL_PH_DSP = 0x18 | OPC_SPECIAL3, */ + OPC_MUL_PH_DSP = 0x18 | OPC_SPECIAL3, OPC_DPA_W_PH_DSP = 0x30 | OPC_SPECIAL3, OPC_DPAQ_W_QH_DSP = 0x34 | OPC_SPECIAL3, /* DSP Bit/Manipulation Sub-class */ @@ -557,7 +555,6 @@ enum { OPC_MULQ_S_PH = (0x1E << 6) | OPC_ADDU_QB_DSP, }; -#define OPC_ADDUH_QB_DSP OPC_MULT_G_2E #define MASK_ADDUH_QB(op) (MASK_SPECIAL3(op) | (op & (0x1F << 6))) enum { /* MIPS DSP Arithmetic Sub-class */ @@ -11663,8 +11660,7 @@ static void gen_mipsdsp_arith(DisasContext *ctx, uint32_t op1, uint32_t op2, gen_load_gpr(v2_t, v2); switch (op1) { - /* OPC_MULT_G_2E is equal OPC_ADDUH_QB_DSP */ - case OPC_MULT_G_2E: + case OPC_ADDUH_QB_DSP: check_dsp_r2(ctx); switch (op2) { case OPC_ADDUH_QB: @@ -12347,11 +12343,7 @@ static void gen_mipsdsp_multiply(DisasContext *ctx, uint32_t op1, uint32_t op2, gen_load_gpr(v2_t, v2); switch (op1) { - /* - * OPC_MULT_G_2E, OPC_ADDUH_QB_DSP, OPC_MUL_PH_DSP have - * the same mask and op1. - */ - case OPC_MULT_G_2E: + case OPC_MUL_PH_DSP: check_dsp_r2(ctx); switch (op2) { case OPC_MUL_PH: @@ -13887,7 +13879,7 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) * OPC_MULT_G_2E, OPC_ADDUH_QB_DSP, OPC_MUL_PH_DSP have * the same mask and op1. */ - if ((ctx->insn_flags & ASE_DSP_R2) && (op1 == OPC_MULT_G_2E)) { + if ((ctx->insn_flags & ASE_DSP_R2) && (op1 == OPC_MUL_PH_DSP)) { op2 = MASK_ADDUH_QB(ctx->opcode); switch (op2) { case OPC_ADDUH_QB: From patchwork Thu Aug 31 20:30:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719029 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp689451wrn; Thu, 31 Aug 2023 13:32:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqvSCdj7xae7JfDWYT4cHvxKsxfYQUvbPzf7nkBYFcrLi/Zghan5Y3o2WrVr9LVNAK/T2L X-Received: by 2002:a0c:8cc4:0:b0:64c:60b3:2709 with SMTP id q4-20020a0c8cc4000000b0064c60b32709mr299296qvb.12.1693513979142; Thu, 31 Aug 2023 13:32:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513979; cv=none; d=google.com; s=arc-20160816; b=sjaEoG6YzsNLaYu4pgKEkmDki6sSURgE4yBYFoYDyS+HyPEgImS/qkMjgGAL1xa0yu 6LMTItw0B9cCZDe9P2JOK+6Q0ZqGqFQ4A3ewqDQGY50Vz7bGLxLSzXgWBX3LISbCWJ7x iVlQuDL9bLqr1CCU0HaHygvSy7ii3iC+NiIaCiMPpRSYkb4L80yYO3eGFnwHD/GnPF2a upk0n0qNuGlpIIjeJMlk+PgioGYB8rqpEo0tCn06G68u3/wrUGp0oLH8zUTFZ0obfyPI kvytm8aFz5tnfRNXj1LFIgQHbU/3YgO7+iOWPNVvV9tahEQM9BWwT7M1qlOXorGRGAg7 Uvjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UKSl6QKl5YP3BJmK7cc1IsXPyIs5XQ30liTp3l8XloU=; fh=uqqN3Fbv51XqPrC7PTK9G5TuXPUMAXaAn7vWZ4VdhFU=; b=FElcJ1lVFEh9Q43hxhzHHY+nBytnylAZLVFiigP1DLOIAr1ELOnCLVOUIE0qKYHuzO O8NshKzsItdEwb+yfyUepXi4ynWjCnS3Xihzx2lfmIVbmToefoYfXdrxIdnVs4EYHI5w WkZhgmRYEy1nF0lQrK1HvakM6GVuEarwOeqq/1DReQTRm182u10ibTPCjjHiZ2zh1kBz YWh+HniVm+Z55XSevLdUrqsZ0rPVIX4cscQW6p4NjliF+FdZRQwER8H5koq2+gSpKkka iJad84CWpitan2mhI74G6Qhy+TJUS0QTKLSxVnsmWuqdK4Mj8KUTayCKsquIsa0wpESM GkdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l66Nufsx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d20-20020a0cf0d4000000b006300ef1a458si1378259qvl.61.2023.08.31.13.32.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l66Nufsx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJb-00008E-8U; Thu, 31 Aug 2023 16:30:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJW-000077-5d for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:53 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJR-0002ef-5W for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:49 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-99bf3f59905so148691566b.3 for ; Thu, 31 Aug 2023 13:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513843; x=1694118643; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UKSl6QKl5YP3BJmK7cc1IsXPyIs5XQ30liTp3l8XloU=; b=l66NufsxvkoES6CdQjrhAkMlZg7aV5wpJjBTHj2db3OKKOPeEqKEF64VhW82RDagb+ 05F2zQaNezUmp89QLxLxdqL7eSjkJCeZ6zX2knjwBADGJVZhv6SLpijkmwaiyBmA6Eic QyTr6rrbqs0LK2ENlvTvG0GykiGavErmxb6EAVNlHBgVXKSK0gau1uipq0iiAFu1qgo3 PrvNTuafikXn/eTWdCUsVfu7btDdB954RMFoqG9jFj01xvQw74+MhZEzFwn9eVa/hfA+ uZMpkKnRpz1rp9eYYsU+yElCLBVlCzfDso52MIX1ypgCdTfivmOaWxytUpSsxjHsZePG 9K8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513843; x=1694118643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UKSl6QKl5YP3BJmK7cc1IsXPyIs5XQ30liTp3l8XloU=; b=UyzVsAGv/UrqNXoLJisFiizrU+xjn2OPBI2FW/cy+J8aQFKU/yI10Bc2EVfhrHlEPE oS/N1AhD3lf3bzmJKbkAMGUZgABYDgW5hk5tglpgz9thSgR9H47JGPg649S8QxvaRUUV 4HhUr8Sb2KskHboMmAqKkup3Bu45bifmB3QrhYKLZqzT/OQYd0co1dkVA0lavKRx4MIs BbSOaOEeadxaUN6sXzBLsLz/yRH6YrSnR75s6koPZTQCuCmbxlbjVn+/ZekB7vPF4Efo Pd2ShWRc1NmCM/cfGubGxG/cl6Mu/6ZdN5xVCJvbuqpNEHqllhU+uOrOIuFF+gRHaCcr 6FoQ== X-Gm-Message-State: AOJu0YzBclxLn/j2Kqoo6FN3QYx2lGYBaSdx5kSbojtjQ9GOtrRpaipz 3gud53WbhsOeADO+h1Wtuc15BF8yNhcJTzI/POM= X-Received: by 2002:a17:907:a04d:b0:99b:cd1a:a453 with SMTP id gz13-20020a170907a04d00b0099bcd1aa453mr280589ejc.3.1693513843347; Thu, 31 Aug 2023 13:30:43 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id g20-20020a1709067c5400b00999bb1e01dfsm1123067ejp.52.2023.08.31.13.30.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:30:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v2 3/7] target/mips: Convert Loongson DDIV.G opcodes to decodetree Date: Thu, 31 Aug 2023 22:30:19 +0200 Message-ID: <20230831203024.87300-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=philmd@linaro.org; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Introduce decode_loongson() to decode all Loongson vendor specific opcodes. Start converting a single opcode: DDIV.G (divide 64-bit signed integers). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/mips/tcg/translate.h | 1 + target/mips/tcg/godson2.decode | 16 ++++++ target/mips/tcg/loong-ext.decode | 17 +++++++ target/mips/tcg/loong_translate.c | 85 +++++++++++++++++++++++++++++++ target/mips/tcg/translate.c | 26 ++-------- target/mips/tcg/meson.build | 3 ++ 6 files changed, 125 insertions(+), 23 deletions(-) create mode 100644 target/mips/tcg/godson2.decode create mode 100644 target/mips/tcg/loong-ext.decode create mode 100644 target/mips/tcg/loong_translate.c diff --git a/target/mips/tcg/translate.h b/target/mips/tcg/translate.h index db3dc932c7..a2365c3c9a 100644 --- a/target/mips/tcg/translate.h +++ b/target/mips/tcg/translate.h @@ -220,6 +220,7 @@ bool decode_ase_mxu(DisasContext *ctx, uint32_t insn); bool decode_isa_rel6(DisasContext *ctx, uint32_t insn); bool decode_ase_msa(DisasContext *ctx, uint32_t insn); bool decode_ext_txx9(DisasContext *ctx, uint32_t insn); +bool decode_ext_loongson(DisasContext *ctx, uint32_t insn); #if defined(TARGET_MIPS64) bool decode_ase_lcsr(DisasContext *ctx, uint32_t insn); bool decode_ext_tx79(DisasContext *ctx, uint32_t insn); diff --git a/target/mips/tcg/godson2.decode b/target/mips/tcg/godson2.decode new file mode 100644 index 0000000000..382123cc3e --- /dev/null +++ b/target/mips/tcg/godson2.decode @@ -0,0 +1,16 @@ +# Godson2 Integer instructions +# +# Copyright (C) 2021 Philippe Mathieu-Daudé +# +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Reference: +# Godson-2E Software Manual +# (Document Number: godson2e-user-manual-V0.6) +# + +&muldiv rs rt rd + +@rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv + +DDIV_G 011111 ..... ..... ..... 00000 011110 @rs_rt_rd diff --git a/target/mips/tcg/loong-ext.decode b/target/mips/tcg/loong-ext.decode new file mode 100644 index 0000000000..407ca5c78b --- /dev/null +++ b/target/mips/tcg/loong-ext.decode @@ -0,0 +1,17 @@ +# Loongson Extension instructions +# +# Copyright (C) 2021 Philippe Mathieu-Daudé +# +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# Reference: +# STLS2F01 User Manual +# Appendix A: new integer instructions +# (Document Number: UM0447) +# + +&muldiv rs rt rd !extern + +@rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv + +DDIV_G 011100 ..... ..... ..... 00000 010101 @rs_rt_rd diff --git a/target/mips/tcg/loong_translate.c b/target/mips/tcg/loong_translate.c new file mode 100644 index 0000000000..bb329ef027 --- /dev/null +++ b/target/mips/tcg/loong_translate.c @@ -0,0 +1,85 @@ +/* + * MIPS Loongson translation routines + * + * Copyright (c) 2004-2005 Jocelyn Mayer + * Copyright (c) 2006 Marius Groeger (FPU operations) + * Copyright (c) 2006 Thiemo Seufer (MIPS32R2 support) + * Copyright (c) 2011 Richard Henderson + * Copyright (c) 2021 Philippe Mathieu-Daudé + * + * This code is licensed under the GNU GPLv2 and later. + */ + +#include "qemu/osdep.h" +#include "translate.h" + +/* Include the auto-generated decoder. */ +#include "decode-godson2.c.inc" +#include "decode-loong-ext.c.inc" + +/* + * Word or double-word Fixed-point instructions. + * -------------------------------------------- + * + * Fixed-point multiplies and divisions write only one result + * into general-purpose registers. + */ + +static bool gen_lext_DIV_G(DisasContext *s, int rd, int rs, int rt) +{ + TCGv t0, t1; + TCGLabel *l1, *l2, *l3; + + if (TARGET_LONG_BITS != 64) { + return false; + } + check_mips_64(s); + + if (rd == 0) { + /* Treat as NOP. */ + return true; + } + + t0 = tcg_temp_new(); + t1 = tcg_temp_new(); + l1 = gen_new_label(); + l2 = gen_new_label(); + l3 = gen_new_label(); + + gen_load_gpr(t0, rs); + gen_load_gpr(t1, rt); + + tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); + tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_br(l3); + gen_set_label(l1); + + tcg_gen_brcondi_tl(TCG_COND_NE, t0, -1LL << 63, l2); + tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); + tcg_gen_mov_tl(cpu_gpr[rd], t0); + + tcg_gen_br(l3); + gen_set_label(l2); + tcg_gen_div_tl(cpu_gpr[rd], t0, t1); + gen_set_label(l3); + + return true; +} + +static bool trans_DDIV_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_DIV_G(s, a->rt, a->rs, a->rd); +} + +bool decode_ext_loongson(DisasContext *ctx, uint32_t insn) +{ + if ((ctx->insn_flags & INSN_LOONGSON2E) + && decode_godson2(ctx, ctx->opcode)) { + return true; + } + if ((ctx->insn_flags & ASE_LEXT) + && decode_loong_ext(ctx, ctx->opcode)) { + return true; + } + return false; +} diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 19e73aea60..42be1689c2 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -334,7 +334,6 @@ enum { OPC_MULTU_G_2F = 0x12 | OPC_SPECIAL2, OPC_DMULTU_G_2F = 0x13 | OPC_SPECIAL2, OPC_DIV_G_2F = 0x14 | OPC_SPECIAL2, - OPC_DDIV_G_2F = 0x15 | OPC_SPECIAL2, OPC_DIVU_G_2F = 0x16 | OPC_SPECIAL2, OPC_DDIVU_G_2F = 0x17 | OPC_SPECIAL2, OPC_MOD_G_2F = 0x1c | OPC_SPECIAL2, @@ -376,7 +375,6 @@ enum { OPC_DIVU_G_2E = 0x1B | OPC_SPECIAL3, OPC_DMULT_G_2E = 0x1C | OPC_SPECIAL3, OPC_DMULTU_G_2E = 0x1D | OPC_SPECIAL3, - OPC_DDIV_G_2E = 0x1E | OPC_SPECIAL3, OPC_DDIVU_G_2E = 0x1F | OPC_SPECIAL3, OPC_MOD_G_2E = 0x22 | OPC_SPECIAL3, OPC_MODU_G_2E = 0x23 | OPC_SPECIAL3, @@ -3708,25 +3706,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, case OPC_DMULTU_G_2F: tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); break; - case OPC_DDIV_G_2E: - case OPC_DDIV_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - TCGLabel *l3 = gen_new_label(); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l3); - gen_set_label(l1); - tcg_gen_brcondi_tl(TCG_COND_NE, t0, -1LL << 63, l2); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); - tcg_gen_mov_tl(cpu_gpr[rd], t0); - tcg_gen_br(l3); - gen_set_label(l2); - tcg_gen_div_tl(cpu_gpr[rd], t0, t1); - gen_set_label(l3); - } - break; case OPC_DDIVU_G_2E: case OPC_DDIVU_G_2F: { @@ -13730,7 +13709,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) break; case OPC_DMULT_G_2F: case OPC_DMULTU_G_2F: - case OPC_DDIV_G_2F: case OPC_DDIVU_G_2F: case OPC_DMOD_G_2F: case OPC_DMODU_G_2F: @@ -14137,7 +14115,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) } break; #if defined(TARGET_MIPS64) - case OPC_DDIV_G_2E: case OPC_DDIVU_G_2E: case OPC_DMULT_G_2E: case OPC_DMULTU_G_2E: @@ -15338,6 +15315,9 @@ static void decode_opc(CPUMIPSState *env, DisasContext *ctx) if (cpu_supports_isa(env, INSN_VR54XX) && decode_ext_vr54xx(ctx, ctx->opcode)) { return; } + if (decode_ext_loongson(ctx, ctx->opcode)) { + return; + } #if defined(TARGET_MIPS64) if (ase_lcsr_available(env) && decode_ase_lcsr(ctx, ctx->opcode)) { return; diff --git a/target/mips/tcg/meson.build b/target/mips/tcg/meson.build index ea7fb582f2..fbb6d6eb40 100644 --- a/target/mips/tcg/meson.build +++ b/target/mips/tcg/meson.build @@ -1,4 +1,6 @@ gen = [ + decodetree.process('godson2.decode', extra_args: ['--static-decode=decode_godson2']), + decodetree.process('loong-ext.decode', extra_args: ['--static-decode=decode_loong_ext']), decodetree.process('rel6.decode', extra_args: ['--decode=decode_isa_rel6']), decodetree.process('msa.decode', extra_args: '--decode=decode_ase_msa'), decodetree.process('tx79.decode', extra_args: '--static-decode=decode_tx79'), @@ -14,6 +16,7 @@ mips_ss.add(files( 'fpu_helper.c', 'ldst_helper.c', 'lmmi_helper.c', + 'loong_translate.c', 'msa_helper.c', 'msa_translate.c', 'op_helper.c', From patchwork Thu Aug 31 20:30:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719023 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp688971wrn; Thu, 31 Aug 2023 13:31:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRYcTuuHd/LXfFbMkNt2A2V90vosD7QD1Kk5uGgzU60rZbSmNVnwPcUzS80aYwGtKtgVxq X-Received: by 2002:a05:620a:4310:b0:76e:fea2:cc84 with SMTP id u16-20020a05620a431000b0076efea2cc84mr471842qko.67.1693513899695; Thu, 31 Aug 2023 13:31:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513899; cv=none; d=google.com; s=arc-20160816; b=aPo7mlK+93pxL//8PM5Dl8ZONyPOlagIYLkQgXT4qJoA80YJztaJvfznAlctPeHgTN 0xMLj7EMjOCjpHZxlRVvikv4GiYJJRl5plgCBJOJLX7dJBI+2h81b0WjrC+AfSK7Pf4s OoIqHC9vwFYc8dnu0U26BhNW6JVwAutVvgr0o0rDzhoTEBR0cy2/TIkrrd5y7RnP02Ud aOXWjrmOhSoo6XLWm8N0ReUwvScMpaznG2e8r+26aT5R987h9mkv9G2Dzpyi2IlaPqIr 5WHSRV/wiGyDdRL3UF6qSplVIf5KQ/6aQnw5/oaaq6Y/D0GtcswFLaa/Fyje5svNQuXI WLYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rt6iE8ggaPyry/ioAw3N5RsRnOtR5rgLa4k2sO+h/kg=; fh=uqqN3Fbv51XqPrC7PTK9G5TuXPUMAXaAn7vWZ4VdhFU=; b=0RPMp76gzxAJSaGW6tWr1GTO3JcnGVyvJuF8itCDKoLgCwN92griNkJ3pO6+xF7uc1 yUrAwk1F5MRtLufzFaSxmw31H8/AV59wkZMC6b5qaRPzsKHvordDZB3s4vVH4baLkimn ylQM5J8e9itbeXH7OKn2puo4TMzq4VnhyfqUbMRSZvoyDz1Xs+CdCHq+dVqEnoG4P4M/ AXjc58azjh0BOT8WLn7TNQ2AacMTv5IlFT3RhkeIlEk6LZyb44ZH2xWNfyqIoXzc1aME KA/Xo8mSXAv8aHjSMVJRlp7+I8Z/A2n1obTvYRHGU5CQxOf3kmExKeQAnJzirLMHLh9j 9ZyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wd6N1qo7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n13-20020a05622a040d00b00408c10b50e0si1393896qtx.204.2023.08.31.13.31.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:31:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wd6N1qo7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJc-000093-8q; Thu, 31 Aug 2023 16:30:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJa-00007y-F5 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:54 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJX-0002hO-Od for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:54 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-99c1c66876aso147768666b.2 for ; Thu, 31 Aug 2023 13:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513849; x=1694118649; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rt6iE8ggaPyry/ioAw3N5RsRnOtR5rgLa4k2sO+h/kg=; b=wd6N1qo7GSP/FUVO9Dtt1txnY2hXFQyE7lHBWLhvwCnoE3CSwDClbetXo5JYVoIPN4 Pb7VvVGXHB4D3CFx7GsHdw37Uz40SnbM1UjoEKTmCIaeOttmRqBz90PXzHhqnOsHvIWc /Cx/y9SXaJmDM4qJMFASnP1y0i3uEMeg6RnSsQYzJXoj78d5xYevkpJWtyaBQ8oUFcm8 FE4UCgSct5D/MZPSIUjLJZiOT+ixJJ1h+Bv06i+TlgDcYCL9ENXzqhCjTsZs87n3Kb1h EI4gX1ok91+LZKShxY5o4/F4MvVA/BpxVD7booAiV7xOzeqIvUgg3KI4eUwZgx/hQmFI weHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513849; x=1694118649; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rt6iE8ggaPyry/ioAw3N5RsRnOtR5rgLa4k2sO+h/kg=; b=lBBEK5MumJE6Xl3U+zlPLdCT1lQttvDuALQyVKKMoCLbTwS10+kjVCPwwRlIogK9A+ HVOa5A9yUXQgALnF45BhPtiVyVBvyq9c+vO4CsDmmmEaJLtomT4qLu/W1d6P250wkGos vyONSTrZAhHA/KFypms5svnz+33HZjgjx/ZQNv/yAnjqhlsELYdAzbIG5m9ZN5RjtmrV MK1z3fXI4mMp/fH51LQX36veoXKOQ/nsONK4+lLrTMqow2Enuzal8/BEPeC6zyUw0/+9 nU0bWc0Xrfmkrl1rlh17jD6ktEhB+BIg4K0LarN8+mQtp/cTXkp2IBOcDGdyuG3qNMnK wBqQ== X-Gm-Message-State: AOJu0YyFhufn+o/bU4Qg7gYUSDsO04CJVBPS+XYGM+qLXxwCiEsHeF9f Csg1GfBD3cHFKHSLl+NuQ67d8ksecCoEwWLRSUI= X-Received: by 2002:a17:907:a057:b0:9a1:c399:14c9 with SMTP id gz23-20020a170907a05700b009a1c39914c9mr286813ejc.15.1693513848976; Thu, 31 Aug 2023 13:30:48 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id a25-20020a1709064a5900b0099bd8c1f67esm1133544ejv.109.2023.08.31.13.30.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:30:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v2 4/7] target/mips: Convert Loongson DIV.G opcodes to decodetree Date: Thu, 31 Aug 2023 22:30:20 +0200 Message-ID: <20230831203024.87300-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé DIV.G and DDIV.G are very similar. Provide gen_lext_DIV_G() a 'is_double' argument so it can generate DIV.G (divide 32-bit signed integers). With this commit we explicit the template used to generate opcode for 32/64-bit word variants. Next commits will be less verbose by providing both variants at once. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/mips/tcg/godson2.decode | 1 + target/mips/tcg/loong-ext.decode | 1 + target/mips/tcg/loong_translate.c | 28 ++++++++++++++++++++++------ target/mips/tcg/translate.c | 26 -------------------------- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/target/mips/tcg/godson2.decode b/target/mips/tcg/godson2.decode index 382123cc3e..91940c1263 100644 --- a/target/mips/tcg/godson2.decode +++ b/target/mips/tcg/godson2.decode @@ -13,4 +13,5 @@ @rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv +DIV_G 011111 ..... ..... ..... 00000 011010 @rs_rt_rd DDIV_G 011111 ..... ..... ..... 00000 011110 @rs_rt_rd diff --git a/target/mips/tcg/loong-ext.decode b/target/mips/tcg/loong-ext.decode index 407ca5c78b..e9378abc8e 100644 --- a/target/mips/tcg/loong-ext.decode +++ b/target/mips/tcg/loong-ext.decode @@ -14,4 +14,5 @@ @rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv +DIV_G 011100 ..... ..... ..... 00000 010100 @rs_rt_rd DDIV_G 011100 ..... ..... ..... 00000 010101 @rs_rt_rd diff --git a/target/mips/tcg/loong_translate.c b/target/mips/tcg/loong_translate.c index bb329ef027..d42cdb7d2e 100644 --- a/target/mips/tcg/loong_translate.c +++ b/target/mips/tcg/loong_translate.c @@ -25,15 +25,18 @@ * into general-purpose registers. */ -static bool gen_lext_DIV_G(DisasContext *s, int rd, int rs, int rt) +static bool gen_lext_DIV_G(DisasContext *s, int rd, int rs, int rt, + bool is_double) { TCGv t0, t1; TCGLabel *l1, *l2, *l3; - if (TARGET_LONG_BITS != 64) { - return false; + if (is_double) { + if (TARGET_LONG_BITS != 64) { + return false; + } + check_mips_64(s); } - check_mips_64(s); if (rd == 0) { /* Treat as NOP. */ @@ -49,26 +52,39 @@ static bool gen_lext_DIV_G(DisasContext *s, int rd, int rs, int rt) gen_load_gpr(t0, rs); gen_load_gpr(t1, rt); + if (!is_double) { + tcg_gen_ext32s_tl(t0, t0); + tcg_gen_ext32s_tl(t1, t1); + } tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); tcg_gen_movi_tl(cpu_gpr[rd], 0); tcg_gen_br(l3); gen_set_label(l1); - tcg_gen_brcondi_tl(TCG_COND_NE, t0, -1LL << 63, l2); + tcg_gen_brcondi_tl(TCG_COND_NE, t0, is_double && TARGET_LONG_BITS == 64 + ? LLONG_MIN : INT_MIN, l2); tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); tcg_gen_mov_tl(cpu_gpr[rd], t0); tcg_gen_br(l3); gen_set_label(l2); tcg_gen_div_tl(cpu_gpr[rd], t0, t1); + if (!is_double) { + tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + } gen_set_label(l3); return true; } +static bool trans_DIV_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_DIV_G(s, a->rt, a->rs, a->rd, false); +} + static bool trans_DDIV_G(DisasContext *s, arg_muldiv *a) { - return gen_lext_DIV_G(s, a->rt, a->rs, a->rd); + return gen_lext_DIV_G(s, a->rt, a->rs, a->rd, true); } bool decode_ext_loongson(DisasContext *ctx, uint32_t insn) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 42be1689c2..59853f1d87 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -333,7 +333,6 @@ enum { OPC_DMULT_G_2F = 0x11 | OPC_SPECIAL2, OPC_MULTU_G_2F = 0x12 | OPC_SPECIAL2, OPC_DMULTU_G_2F = 0x13 | OPC_SPECIAL2, - OPC_DIV_G_2F = 0x14 | OPC_SPECIAL2, OPC_DIVU_G_2F = 0x16 | OPC_SPECIAL2, OPC_DDIVU_G_2F = 0x17 | OPC_SPECIAL2, OPC_MOD_G_2F = 0x1c | OPC_SPECIAL2, @@ -371,7 +370,6 @@ enum { /* Loongson 2E */ OPC_MULT_G_2E = 0x18 | OPC_SPECIAL3, OPC_MULTU_G_2E = 0x19 | OPC_SPECIAL3, - OPC_DIV_G_2E = 0x1A | OPC_SPECIAL3, OPC_DIVU_G_2E = 0x1B | OPC_SPECIAL3, OPC_DMULT_G_2E = 0x1C | OPC_SPECIAL3, OPC_DMULTU_G_2E = 0x1D | OPC_SPECIAL3, @@ -3623,28 +3621,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); break; - case OPC_DIV_G_2E: - case OPC_DIV_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - TCGLabel *l3 = gen_new_label(); - tcg_gen_ext32s_tl(t0, t0); - tcg_gen_ext32s_tl(t1, t1); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l3); - gen_set_label(l1); - tcg_gen_brcondi_tl(TCG_COND_NE, t0, INT_MIN, l2); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1, l2); - tcg_gen_mov_tl(cpu_gpr[rd], t0); - tcg_gen_br(l3); - gen_set_label(l2); - tcg_gen_div_tl(cpu_gpr[rd], t0, t1); - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); - gen_set_label(l3); - } - break; case OPC_DIVU_G_2E: case OPC_DIVU_G_2F: { @@ -13674,7 +13650,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) case OPC_MUL: gen_arith(ctx, op1, rd, rs, rt); break; - case OPC_DIV_G_2F: case OPC_DIVU_G_2F: case OPC_MULT_G_2F: case OPC_MULTU_G_2F: @@ -13847,7 +13822,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) op1 = MASK_SPECIAL3(ctx->opcode); switch (op1) { - case OPC_DIV_G_2E: case OPC_DIVU_G_2E: case OPC_MOD_G_2E: case OPC_MODU_G_2E: From patchwork Thu Aug 31 20:30:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719025 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp689291wrn; Thu, 31 Aug 2023 13:32:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfp2D29bJj0LjT6Ybv/5PVYHfnZHLRFAGBj1+Yct8ENpzaGbMOvLpHM7nprNLlGwiSUGRY X-Received: by 2002:a0c:f286:0:b0:64f:4321:e46d with SMTP id k6-20020a0cf286000000b0064f4321e46dmr330727qvl.8.1693513951426; Thu, 31 Aug 2023 13:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513951; cv=none; d=google.com; s=arc-20160816; b=t0kGpqt+0zebOvnGzIY78o0dpQLnQJ0RmI75wUyBNtPioE937j3iXUndaIjCEidQkQ WMgaXcwDpv6JgraAT5nb2OkdfIpGQI9Sf5em4FDMvpjC3MzW6Of741PK7EHx24dsvE/Z TiHtHVHoG8pn6HhAcwR5K031IA61yhjCuHxO+XY1qd8pb7QCqKP2RaIHfSQVtcA/TBCK Z27aowlSzj+/hey6HCplzBbYgGc38PWqwWuvUjcMrfMJl4+8H7Pk421O2tN81DbhhC02 P5qszPWxCtUerQcnmJc+5u64I8RyrlmAX/96njRwPnbM3rggtMBNnou8ph07Wyoign7c SUbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=v5ahbwysnfVzLLZgaHX/S0gGsWmbKaRZ7KZifG+Dg0c=; fh=uqqN3Fbv51XqPrC7PTK9G5TuXPUMAXaAn7vWZ4VdhFU=; b=ft3yGWL+TdLAvaJkoG/s0yeruq4vKaJtDL1MYNPBCQ6QJrnZnzT+r+wOY6znq2XlSq CQnF17zlnM3GAx3/PmmR8UO3fnhKPp1CmU//rolRtU0K+4NRKFUHfzGs0fofBhx/ttkG iWekJSJWgK8rqblquG7YmFPhF312ch1UVpM9oM+hHhymFv67y8x9ZlO0IcQ5hALfxGj0 a4kyNlkfBdVzNA9lD1IirbHM82k1VXUyMX6nfRKmhux+1TNB1rIR67lvYJ3zlSGwL6kP DfmIgjQhXchUF3RhufLzrI4STkgJto4jalBfOUT4oz7hP262hOk7jOACN5MCt1FIA+cA BwCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=psiF9Jy7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g16-20020a0caad0000000b0064bda96f16fsi1337183qvb.318.2023.08.31.13.32.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:32:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=psiF9Jy7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJk-0000A0-6A; Thu, 31 Aug 2023 16:31:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJg-00009e-4i for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:31:00 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJd-0002kx-KJ for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:30:59 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-5008faf4456so2399555e87.3 for ; Thu, 31 Aug 2023 13:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513854; x=1694118654; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v5ahbwysnfVzLLZgaHX/S0gGsWmbKaRZ7KZifG+Dg0c=; b=psiF9Jy7HYtZrgk+h7EsrNH5eOroovwAzXH0j0UYFwwh1sxJp7NEGaZ8Y4iQ1YuNyg xW3X5ke0BlJipmWPCrHtusgH12ePl+E9eY4JtMO884vfv0+tA4bStXFDVeaFl9z6Jdml O/Zn7rc65aECIJWiVNjfsFrExN18SJ/MjM5Jz3hZbQq0Rjd6dS34xohfKI7a83AIZb0s u6p77Cn9fUtEeUnErf5fra3nw4xXj8a8biDSWF16DgzhJBb/8gFWxu/h117sAc1AiMaN 85uLpsM1xVTF4q6NVAzkLs5SuqiNLlh8wtene3FwPQs1yQjw/GKbUcw2v0au5iL1lxDS /aUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513854; x=1694118654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v5ahbwysnfVzLLZgaHX/S0gGsWmbKaRZ7KZifG+Dg0c=; b=EEBXNTt2zF49xtn7mgRU9X+XrYUuyAftUEMSHsY240ilnIPosA3pMhIQlOVGMhU/oG 7Vmto65H5WsWLq18PDs075u/+ArEMy64gPm+6sMeqbgpN6PM4r0OdQ7LlIV1b0iKV+EY IwNcxynAkSpTvWfss14VAvyz2n952WBy+hhO5eesUH084/lkKu4zEVEvU0W6eLOQqOPk 15UMDeYd2ySq3bSJahxokiCIecQl5GOCcETzYEubRO99RdCm8v4PDWx0F0JN4TOnADXf j6n2tvJpibe+f/x4CdmP3pGHkVWBbq9gA36Bk/7U9foT7ZHEoxip/T9+/Kaaze7Abl4c Q9bg== X-Gm-Message-State: AOJu0Yx3IIIarXeuer2q+V+7wBaB6eoQkbRaPK9EgUxeUNVUpxdKHxjc VNmEoMNiDkfQYTEuhuqEdS81bwtawPODeMHrK1w= X-Received: by 2002:a05:6512:3c9e:b0:500:c2d7:3ab4 with SMTP id h30-20020a0565123c9e00b00500c2d73ab4mr292336lfv.8.1693513854500; Thu, 31 Aug 2023 13:30:54 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id gj17-20020a170906e11100b009929ab17bdfsm1113496ejb.168.2023.08.31.13.30.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:30:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v2 5/7] target/mips: Convert Loongson [D]DIVU.G opcodes to decodetree Date: Thu, 31 Aug 2023 22:30:21 +0200 Message-ID: <20230831203024.87300-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=philmd@linaro.org; helo=mail-lf1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Convert DIVU.G (divide 32-bit unsigned integers) and DDIVU.G (divide 64-bit unsigned integers) opcodes to decodetree. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/mips/tcg/godson2.decode | 2 ++ target/mips/tcg/loong-ext.decode | 2 ++ target/mips/tcg/loong_translate.c | 54 +++++++++++++++++++++++++++++++ target/mips/tcg/translate.c | 37 --------------------- 4 files changed, 58 insertions(+), 37 deletions(-) diff --git a/target/mips/tcg/godson2.decode b/target/mips/tcg/godson2.decode index 91940c1263..4352d1e5e7 100644 --- a/target/mips/tcg/godson2.decode +++ b/target/mips/tcg/godson2.decode @@ -14,4 +14,6 @@ @rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv DIV_G 011111 ..... ..... ..... 00000 011010 @rs_rt_rd +DIVU_G 011111 ..... ..... ..... 00000 011011 @rs_rt_rd DDIV_G 011111 ..... ..... ..... 00000 011110 @rs_rt_rd +DDIVU_G 011111 ..... ..... ..... 00000 011111 @rs_rt_rd diff --git a/target/mips/tcg/loong-ext.decode b/target/mips/tcg/loong-ext.decode index e9378abc8e..77639227a1 100644 --- a/target/mips/tcg/loong-ext.decode +++ b/target/mips/tcg/loong-ext.decode @@ -16,3 +16,5 @@ DIV_G 011100 ..... ..... ..... 00000 010100 @rs_rt_rd DDIV_G 011100 ..... ..... ..... 00000 010101 @rs_rt_rd +DIVU_G 011100 ..... ..... ..... 00000 010110 @rs_rt_rd +DDIVU_G 011100 ..... ..... ..... 00000 010111 @rs_rt_rd diff --git a/target/mips/tcg/loong_translate.c b/target/mips/tcg/loong_translate.c index d42cdb7d2e..87023696a0 100644 --- a/target/mips/tcg/loong_translate.c +++ b/target/mips/tcg/loong_translate.c @@ -87,6 +87,60 @@ static bool trans_DDIV_G(DisasContext *s, arg_muldiv *a) return gen_lext_DIV_G(s, a->rt, a->rs, a->rd, true); } +static bool gen_lext_DIVU_G(DisasContext *s, int rd, int rs, int rt, + bool is_double) +{ + TCGv t0, t1; + TCGLabel *l1, *l2; + + if (is_double) { + if (TARGET_LONG_BITS != 64) { + return false; + } + check_mips_64(s); + } + + if (rd == 0) { + /* Treat as NOP. */ + return true; + } + + t0 = tcg_temp_new(); + t1 = tcg_temp_new(); + l1 = gen_new_label(); + l2 = gen_new_label(); + + gen_load_gpr(t0, rs); + gen_load_gpr(t1, rt); + + if (!is_double) { + tcg_gen_ext32u_tl(t0, t0); + tcg_gen_ext32u_tl(t1, t1); + } + tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); + tcg_gen_movi_tl(cpu_gpr[rd], 0); + + tcg_gen_br(l2); + gen_set_label(l1); + tcg_gen_divu_tl(cpu_gpr[rd], t0, t1); + if (!is_double) { + tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + } + gen_set_label(l2); + + return true; +} + +static bool trans_DIVU_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_DIVU_G(s, a->rt, a->rs, a->rd, false); +} + +static bool trans_DDIVU_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_DIVU_G(s, a->rt, a->rs, a->rd, true); +} + bool decode_ext_loongson(DisasContext *ctx, uint32_t insn) { if ((ctx->insn_flags & INSN_LOONGSON2E) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 59853f1d87..f1c99a9218 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -333,8 +333,6 @@ enum { OPC_DMULT_G_2F = 0x11 | OPC_SPECIAL2, OPC_MULTU_G_2F = 0x12 | OPC_SPECIAL2, OPC_DMULTU_G_2F = 0x13 | OPC_SPECIAL2, - OPC_DIVU_G_2F = 0x16 | OPC_SPECIAL2, - OPC_DDIVU_G_2F = 0x17 | OPC_SPECIAL2, OPC_MOD_G_2F = 0x1c | OPC_SPECIAL2, OPC_DMOD_G_2F = 0x1d | OPC_SPECIAL2, OPC_MODU_G_2F = 0x1e | OPC_SPECIAL2, @@ -370,10 +368,8 @@ enum { /* Loongson 2E */ OPC_MULT_G_2E = 0x18 | OPC_SPECIAL3, OPC_MULTU_G_2E = 0x19 | OPC_SPECIAL3, - OPC_DIVU_G_2E = 0x1B | OPC_SPECIAL3, OPC_DMULT_G_2E = 0x1C | OPC_SPECIAL3, OPC_DMULTU_G_2E = 0x1D | OPC_SPECIAL3, - OPC_DDIVU_G_2E = 0x1F | OPC_SPECIAL3, OPC_MOD_G_2E = 0x22 | OPC_SPECIAL3, OPC_MODU_G_2E = 0x23 | OPC_SPECIAL3, OPC_DMOD_G_2E = 0x26 | OPC_SPECIAL3, @@ -3621,22 +3617,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); break; - case OPC_DIVU_G_2E: - case OPC_DIVU_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_divu_tl(cpu_gpr[rd], t0, t1); - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); - gen_set_label(l2); - } - break; case OPC_MOD_G_2E: case OPC_MOD_G_2F: { @@ -3682,19 +3662,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, case OPC_DMULTU_G_2F: tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); break; - case OPC_DDIVU_G_2E: - case OPC_DDIVU_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_divu_tl(cpu_gpr[rd], t0, t1); - gen_set_label(l2); - } - break; case OPC_DMOD_G_2E: case OPC_DMOD_G_2F: { @@ -13650,7 +13617,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) case OPC_MUL: gen_arith(ctx, op1, rd, rs, rt); break; - case OPC_DIVU_G_2F: case OPC_MULT_G_2F: case OPC_MULTU_G_2F: case OPC_MOD_G_2F: @@ -13684,7 +13650,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) break; case OPC_DMULT_G_2F: case OPC_DMULTU_G_2F: - case OPC_DDIVU_G_2F: case OPC_DMOD_G_2F: case OPC_DMODU_G_2F: check_insn(ctx, INSN_LOONGSON2F | ASE_LEXT); @@ -13822,7 +13787,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) op1 = MASK_SPECIAL3(ctx->opcode); switch (op1) { - case OPC_DIVU_G_2E: case OPC_MOD_G_2E: case OPC_MODU_G_2E: case OPC_MULT_G_2E: @@ -14089,7 +14053,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) } break; #if defined(TARGET_MIPS64) - case OPC_DDIVU_G_2E: case OPC_DMULT_G_2E: case OPC_DMULTU_G_2E: case OPC_DMOD_G_2E: From patchwork Thu Aug 31 20:30:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719024 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp689235wrn; Thu, 31 Aug 2023 13:32:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8nfkn9JHWHlj1K/U+CvYIiiSJf/gmIMCC44ZOgQP9XpQKoDSueMzQOYfVvq5/YnKJbD9D X-Received: by 2002:a05:620a:4045:b0:76f:2167:1188 with SMTP id i5-20020a05620a404500b0076f21671188mr514090qko.7.1693513940229; Thu, 31 Aug 2023 13:32:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513940; cv=none; d=google.com; s=arc-20160816; b=sBHddwMJDMqjtLJDJ17Mi2Ar2u9yRm4Ql/UiJqWaZ3Id/1kk8KsEnhFKwV6yjnxDq7 6+jayguSSoaGLX2UADTbLraHjtgZ3xLPMP9iTJKBaq+FFM4jnnNs/3Vmu9BoMsRgkVgV 8V8ZQaK2V5qwBzbFSo95w95ddyNPzqL2lIJVsiP8tm2N7oAud4/sErVnLj/tXYJvH6yv 1biqGU+AdovmCbvIrTYR5xLmeg97LUDXDN/YT0THt108NsZNGMJAeaIvFbMiHAD2WInY qc3aZJHDkIlEhFu1L+X/llP6Io6j3O5fg+fqXS5JOdLz3ZdAIprUALmU8VW81E/Jfzp9 vrHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YxNrNRgFFV/AAAT6JMiONDW218OhK4/S9sVDVf48+HY=; fh=uqqN3Fbv51XqPrC7PTK9G5TuXPUMAXaAn7vWZ4VdhFU=; b=D9Uf/gY6leKEncjJCJD8N41Sp7AY9Dp25Za1o67GADJWSsQlfb3e4j+LgMxOcXUn1/ zl4bVxoWHCDt1a71xfuTejohojHdHRBLjb78Imfyg3j5M0Y+t6QjEUiT1Wx8DSC7BX8D +glOJ61LbVj/+NbrmGkck8b/x0mUbQDQdhO4/2wrt+Izt4km7Db4tNtJUzS4fnoff4ol Wtw7w4//zM8qmW0cqyRiMVBQzvs0w9nY6C2ZrWJWdRappUXeniiRsby+z2mTkamNjZoC 1yYYh2+Cn9m08Z3XvzrshHNggq7/otNs4ivRleoRCk1jcODvBjSCDnNMBTPY5u8a9/v8 fYUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uBm1B8HZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dw27-20020a05620a601b00b00767d8e12c98si1525714qkb.282.2023.08.31.13.32.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:32:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uBm1B8HZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJq-0000AZ-0a; Thu, 31 Aug 2023 16:31:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJn-0000AR-Js for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:31:07 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJk-0002oS-O0 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:31:07 -0400 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-52a3ff5f0abso1694348a12.1 for ; Thu, 31 Aug 2023 13:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513860; x=1694118660; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YxNrNRgFFV/AAAT6JMiONDW218OhK4/S9sVDVf48+HY=; b=uBm1B8HZOpd9/IzCK2m1vEoYdCXdObA4UdIIT7kzU6izbb6upRnsoTaPbvSFPAj0dk HQS8njrHgBG4aBkSmkcMH1kvUg61begV/hEsK+xGZqFwYgoA+XyitrJmlX4CnjE48J30 og4gu3GWMl5zh+/ZjiBcdRB1+42IATbRU0819B698k8gtUIDAzaDvPuZvlO6AuQN20hG V+njBjwIWm9io6/8Kq4dcisomRLINUFGgwZxEYNuwY5uRKBZ+bKrUYOG8iu6GKWftw6+ +IhXfOBYZznBM18cTcQDns0u2+hBLs3NUUmPovMc2I1ZQiwMSG/q0h2l46W1YBWKRELQ K4oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513860; x=1694118660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YxNrNRgFFV/AAAT6JMiONDW218OhK4/S9sVDVf48+HY=; b=XEbQThzZMGuWI7+kvH//0mAjQ2nUa2PvD/orEAYABguAikyO0zYZshMQJI/xciNXC6 MjOq8yGXpJMhtUutZwcklC0zp6CN4gmzrMVLS8xyv8oXTb5H1RAOWjEFEYGJVqxa3uO2 fncToCQRtGyrP4tcj04uT8v3uaYtFYH96d55vLanPhxkY4Ci1WsgNVmjTJVeFefMCQ+9 XQjsmj5r8PxSssYCyS1EGbZmbVh6ZIWtvegsOrQHonmZOzqFb9Xku/MMs/JjwmK6jGhh grMMXoJzNhUVdj/aVxoilCPDaWlM8NvB84iytaczJ3B001UGy75wF4+btY6odfaE9d9K 3LBQ== X-Gm-Message-State: AOJu0Yy43AylxG4mgvRbk522KY8HaXchzdNHB7zr2wlb2zzrOHH+cwot zXBsoVpbbKykJ/h9nhAYstrHNzKrbFwN4T+OEws= X-Received: by 2002:a50:ef13:0:b0:523:102f:3cdd with SMTP id m19-20020a50ef13000000b00523102f3cddmr541511eds.19.1693513860447; Thu, 31 Aug 2023 13:31:00 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id a3-20020aa7cf03000000b0052348d74865sm1182071edy.61.2023.08.31.13.30.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:31:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v2 6/7] target/mips: Convert Loongson [D]MOD[U].G opcodes to decodetree Date: Thu, 31 Aug 2023 22:30:22 +0200 Message-ID: <20230831203024.87300-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=philmd@linaro.org; helo=mail-ed1-x533.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Convert the following opcodes to decodetree: - MOD.G - mod 32-bit signed integers - MODU.G - mod 32-bit unsigned integers - DMOD.G - mod 64-bit signed integers - DMODU.G - mod 64-bit unsigned integers Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/mips/tcg/godson2.decode | 5 ++ target/mips/tcg/loong-ext.decode | 5 ++ target/mips/tcg/loong_translate.c | 111 ++++++++++++++++++++++++++++++ target/mips/tcg/translate.c | 82 ---------------------- 4 files changed, 121 insertions(+), 82 deletions(-) diff --git a/target/mips/tcg/godson2.decode b/target/mips/tcg/godson2.decode index 4352d1e5e7..e3bf6b12e4 100644 --- a/target/mips/tcg/godson2.decode +++ b/target/mips/tcg/godson2.decode @@ -17,3 +17,8 @@ DIV_G 011111 ..... ..... ..... 00000 011010 @rs_rt_rd DIVU_G 011111 ..... ..... ..... 00000 011011 @rs_rt_rd DDIV_G 011111 ..... ..... ..... 00000 011110 @rs_rt_rd DDIVU_G 011111 ..... ..... ..... 00000 011111 @rs_rt_rd + +MOD_G 011111 ..... ..... ..... 00000 100010 @rs_rt_rd +MODU_G 011111 ..... ..... ..... 00000 100011 @rs_rt_rd +DMOD_G 011111 ..... ..... ..... 00000 100110 @rs_rt_rd +DMODU_G 011111 ..... ..... ..... 00000 100111 @rs_rt_rd diff --git a/target/mips/tcg/loong-ext.decode b/target/mips/tcg/loong-ext.decode index 77639227a1..d63406e3f4 100644 --- a/target/mips/tcg/loong-ext.decode +++ b/target/mips/tcg/loong-ext.decode @@ -18,3 +18,8 @@ DIV_G 011100 ..... ..... ..... 00000 010100 @rs_rt_rd DDIV_G 011100 ..... ..... ..... 00000 010101 @rs_rt_rd DIVU_G 011100 ..... ..... ..... 00000 010110 @rs_rt_rd DDIVU_G 011100 ..... ..... ..... 00000 010111 @rs_rt_rd + +MOD_G 011100 ..... ..... ..... 00000 011100 @rs_rt_rd +DMOD_G 011100 ..... ..... ..... 00000 011101 @rs_rt_rd +MODU_G 011100 ..... ..... ..... 00000 011110 @rs_rt_rd +DMODU_G 011100 ..... ..... ..... 00000 011111 @rs_rt_rd diff --git a/target/mips/tcg/loong_translate.c b/target/mips/tcg/loong_translate.c index 87023696a0..bddf1cb7aa 100644 --- a/target/mips/tcg/loong_translate.c +++ b/target/mips/tcg/loong_translate.c @@ -141,6 +141,117 @@ static bool trans_DDIVU_G(DisasContext *s, arg_muldiv *a) return gen_lext_DIVU_G(s, a->rt, a->rs, a->rd, true); } +static bool gen_lext_MOD_G(DisasContext *s, int rd, int rs, int rt, + bool is_double) +{ + TCGv t0, t1; + TCGLabel *l1, *l2, *l3; + + if (is_double) { + if (TARGET_LONG_BITS != 64) { + return false; + } + check_mips_64(s); + } + + if (rd == 0) { + /* Treat as NOP. */ + return true; + } + + t0 = tcg_temp_new(); + t1 = tcg_temp_new(); + l1 = gen_new_label(); + l2 = gen_new_label(); + l3 = gen_new_label(); + + gen_load_gpr(t0, rs); + gen_load_gpr(t1, rt); + + if (!is_double) { + tcg_gen_ext32u_tl(t0, t0); + tcg_gen_ext32u_tl(t1, t1); + } + tcg_gen_brcondi_tl(TCG_COND_EQ, t1, 0, l1); + tcg_gen_brcondi_tl(TCG_COND_NE, t0, is_double && TARGET_LONG_BITS == 64 + ? LLONG_MIN : INT_MIN, l2); + tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); + gen_set_label(l1); + tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_br(l3); + gen_set_label(l2); + tcg_gen_rem_tl(cpu_gpr[rd], t0, t1); + if (!is_double) { + tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + } + gen_set_label(l3); + + return true; +} + +static bool trans_MOD_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_MOD_G(s, a->rt, a->rs, a->rd, false); +} + +static bool trans_DMOD_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_MOD_G(s, a->rt, a->rs, a->rd, true); +} + +static bool gen_lext_MODU_G(DisasContext *s, int rd, int rs, int rt, + bool is_double) +{ + TCGv t0, t1; + TCGLabel *l1, *l2; + + if (is_double) { + if (TARGET_LONG_BITS != 64) { + return false; + } + check_mips_64(s); + } + + if (rd == 0) { + /* Treat as NOP. */ + return true; + } + + t0 = tcg_temp_new(); + t1 = tcg_temp_new(); + l1 = gen_new_label(); + l2 = gen_new_label(); + + gen_load_gpr(t0, rs); + gen_load_gpr(t1, rt); + + if (!is_double) { + tcg_gen_ext32u_tl(t0, t0); + tcg_gen_ext32u_tl(t1, t1); + } + tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); + tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_br(l2); + gen_set_label(l1); + tcg_gen_remu_tl(cpu_gpr[rd], t0, t1); + if (!is_double) { + tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + } + gen_set_label(l2); + + return true; +} + +static bool trans_MODU_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_MODU_G(s, a->rt, a->rs, a->rd, false); +} + +static bool trans_DMODU_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_MODU_G(s, a->rt, a->rs, a->rd, true); +} + bool decode_ext_loongson(DisasContext *ctx, uint32_t insn) { if ((ctx->insn_flags & INSN_LOONGSON2E) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index f1c99a9218..2cfabb3103 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -333,10 +333,6 @@ enum { OPC_DMULT_G_2F = 0x11 | OPC_SPECIAL2, OPC_MULTU_G_2F = 0x12 | OPC_SPECIAL2, OPC_DMULTU_G_2F = 0x13 | OPC_SPECIAL2, - OPC_MOD_G_2F = 0x1c | OPC_SPECIAL2, - OPC_DMOD_G_2F = 0x1d | OPC_SPECIAL2, - OPC_MODU_G_2F = 0x1e | OPC_SPECIAL2, - OPC_DMODU_G_2F = 0x1f | OPC_SPECIAL2, /* Misc */ OPC_CLZ = 0x20 | OPC_SPECIAL2, OPC_CLO = 0x21 | OPC_SPECIAL2, @@ -370,10 +366,6 @@ enum { OPC_MULTU_G_2E = 0x19 | OPC_SPECIAL3, OPC_DMULT_G_2E = 0x1C | OPC_SPECIAL3, OPC_DMULTU_G_2E = 0x1D | OPC_SPECIAL3, - OPC_MOD_G_2E = 0x22 | OPC_SPECIAL3, - OPC_MODU_G_2E = 0x23 | OPC_SPECIAL3, - OPC_DMOD_G_2E = 0x26 | OPC_SPECIAL3, - OPC_DMODU_G_2E = 0x27 | OPC_SPECIAL3, /* MIPS DSP Load */ OPC_LX_DSP = 0x0A | OPC_SPECIAL3, @@ -3617,42 +3609,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); break; - case OPC_MOD_G_2E: - case OPC_MOD_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - TCGLabel *l3 = gen_new_label(); - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); - tcg_gen_brcondi_tl(TCG_COND_EQ, t1, 0, l1); - tcg_gen_brcondi_tl(TCG_COND_NE, t0, INT_MIN, l2); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1, l2); - gen_set_label(l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l3); - gen_set_label(l2); - tcg_gen_rem_tl(cpu_gpr[rd], t0, t1); - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); - gen_set_label(l3); - } - break; - case OPC_MODU_G_2E: - case OPC_MODU_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_remu_tl(cpu_gpr[rd], t0, t1); - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); - gen_set_label(l2); - } - break; #if defined(TARGET_MIPS64) case OPC_DMULT_G_2E: case OPC_DMULT_G_2F: @@ -3662,36 +3618,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, case OPC_DMULTU_G_2F: tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); break; - case OPC_DMOD_G_2E: - case OPC_DMOD_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - TCGLabel *l3 = gen_new_label(); - tcg_gen_brcondi_tl(TCG_COND_EQ, t1, 0, l1); - tcg_gen_brcondi_tl(TCG_COND_NE, t0, -1LL << 63, l2); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); - gen_set_label(l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l3); - gen_set_label(l2); - tcg_gen_rem_tl(cpu_gpr[rd], t0, t1); - gen_set_label(l3); - } - break; - case OPC_DMODU_G_2E: - case OPC_DMODU_G_2F: - { - TCGLabel *l1 = gen_new_label(); - TCGLabel *l2 = gen_new_label(); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); - tcg_gen_br(l2); - gen_set_label(l1); - tcg_gen_remu_tl(cpu_gpr[rd], t0, t1); - gen_set_label(l2); - } - break; #endif } } @@ -13619,8 +13545,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) break; case OPC_MULT_G_2F: case OPC_MULTU_G_2F: - case OPC_MOD_G_2F: - case OPC_MODU_G_2F: check_insn(ctx, INSN_LOONGSON2F | ASE_LEXT); gen_loongson_integer(ctx, op1, rd, rs, rt); break; @@ -13650,8 +13574,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) break; case OPC_DMULT_G_2F: case OPC_DMULTU_G_2F: - case OPC_DMOD_G_2F: - case OPC_DMODU_G_2F: check_insn(ctx, INSN_LOONGSON2F | ASE_LEXT); gen_loongson_integer(ctx, op1, rd, rs, rt); break; @@ -13787,8 +13709,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) op1 = MASK_SPECIAL3(ctx->opcode); switch (op1) { - case OPC_MOD_G_2E: - case OPC_MODU_G_2E: case OPC_MULT_G_2E: case OPC_MULTU_G_2E: /* @@ -14055,8 +13975,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) #if defined(TARGET_MIPS64) case OPC_DMULT_G_2E: case OPC_DMULTU_G_2E: - case OPC_DMOD_G_2E: - case OPC_DMODU_G_2E: check_insn(ctx, INSN_LOONGSON2E); gen_loongson_integer(ctx, op1, rd, rs, rt); break; From patchwork Thu Aug 31 20:30:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 719026 Delivered-To: patch@linaro.org Received: by 2002:adf:e5c2:0:b0:31d:da82:a3b4 with SMTP id a2csp689301wrn; Thu, 31 Aug 2023 13:32:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxfQEs1Cj3gOlwiix7xCAMnNUbEQ2ku7PauvpAEG6NZKQVSAa9NUZIScadk8wor5oIL/YT X-Received: by 2002:a0c:b31a:0:b0:649:cbd0:8127 with SMTP id s26-20020a0cb31a000000b00649cbd08127mr335690qve.57.1693513953551; Thu, 31 Aug 2023 13:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693513953; cv=none; d=google.com; s=arc-20160816; b=wD8N8VbWcMvXpTyFHhbuWda2Z8CGafX4af/zExgRTLBWGs+RzlpmO3NHR7lIGGUj69 jmd+DeXomXev68tUs74jqUjYHLASNt5PE5z6S/phkanCgMcueVfrxV7KyUO7+eJnogKQ 3o29Nof4E98KylYQc0z3v+KFInM4TzhzvSBOUoDP5egWKgcoHG87exIgz7/uX4SzEWpa Wfci8oxd9/QhZ32FlouhwtCUW3zlR6B2zvD9jFiNT9UlL0kiJVen8pSsErKamyyLKlFW pqrSsslzhGnCQEngEZEzhZLKSibteZU8vaP1tSM8EXIPq2isLG8lTVNmL6GYtbSDa6nC 0iuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VGIdt7gdw15SUX7XAakdKyogx2vXcJbQwgMp+pQoatU=; fh=fMxWmgvj3kASCAB6dXEge22u+PdLb4eZFng9E91mFrM=; b=M99vgF04BjNgliK43f/nhvbWbDbjvEP9rlz343lAfea/fmmywYHEaG62raYtNmA257 w/n7zXfDB1I69AWQ4JCcL5dVdwt/pLCSNwcbj+/5ikAoGd+9dgr+1eVKrMmXu0yKvV18 z0dT2L6qoLXSCEVjMVYbjbWkTO44jC9znBcCQ62wrTtMWynVEO06YHq3ESEF6z4kN2ZC uC9AMMEWABkDBVUWYftSqf0NAu6iipcK44jIXARDYULjWf7pzM/PjXF3QWTl9SHhW4Xr KF8TCzBVtXXMtMm0PML+hcUZKRy/2M3KGemhaGDRRu1/A4XQTtB2VryEvhSWesdej8lH naYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NmvpEyzG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ro24-20020a05620a399800b0076d74313612si1377632qkn.280.2023.08.31.13.32.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Aug 2023 13:32:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NmvpEyzG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qboJu-0000BJ-R1; Thu, 31 Aug 2023 16:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qboJs-0000Aw-Em for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:31:12 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qboJp-0002rm-B0 for qemu-devel@nongnu.org; Thu, 31 Aug 2023 16:31:12 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31aeedbb264so1114324f8f.0 for ; Thu, 31 Aug 2023 13:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1693513866; x=1694118666; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VGIdt7gdw15SUX7XAakdKyogx2vXcJbQwgMp+pQoatU=; b=NmvpEyzGnR/l4BHEQPoNHzwxrgH63KswG170GP8o43M9oDv4N5965P+I2nnDF0/v8e orhzziWzo2Xu3npwL+oo3hAS0s+ksZXxWWS6W0X5lJvYIydX+uXbTKxjKr1atxdcPuCm fbYTgx/jwXBfKJDmAWXS0qrKyQsT+C7I7ayCN0SI+muzyfj+xnLXUUWHpO/fM9hWsUp7 2UIqjvfMr5XHQSfnTleVEME9oqyutCsPP1KDhpgyILlefdknuKmz/7ygaN99T+svEvX7 eaguNbOeOzwmwwKY1SQfn0DvP0ryZ90YRIy8ZpMdS89jkj+sL511OuV+kAcglBssAFJU d9wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693513866; x=1694118666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VGIdt7gdw15SUX7XAakdKyogx2vXcJbQwgMp+pQoatU=; b=cFb1zr30X6o8isylf74m7fCZYZcT9qW5t5PBBAGwBixq4BcJLC4VRy8MbEUWmPitOq cdfkmysGakEYJYHpx5bzSdSYMhYs+opwSbnchWzUSJGdrPkK/B2nxUwLeKThYbeBrDCR VMuQSUxEkOtWV70iNW6WlAVzo0eM+el9NyroGiDQpxRvxWlGfaSbHUFOEcwjcJi5ipGt 31+3V0fkUvD4xau733K1acdqDOA4kv8vQnPE9g8vsPqXmXTuWlcb7adZh6JjIk6qG6Ms t8cKh/tw8LlCb4MhC7wObDkec+TMm+iCXpLCveqfnTDhSN5JXFAjILivZUufUoKbzmL0 rykw== X-Gm-Message-State: AOJu0Yy9X2lV0iKCLYgEy/ly6ZnAsnHfmbHC4BFR8U6ZME55DK3TPBfW eyec48VSCpHDQNV4N1OiEH3i9WyY06La4K3Uj/4= X-Received: by 2002:adf:f6c7:0:b0:31d:74f8:fae with SMTP id y7-20020adff6c7000000b0031d74f80faemr366679wrp.71.1693513866474; Thu, 31 Aug 2023 13:31:06 -0700 (PDT) Received: from m1x-phil.lan ([176.187.199.245]) by smtp.gmail.com with ESMTPSA id q6-20020aa7da86000000b0052a063e52b8sm1168685eds.83.2023.08.31.13.31.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 31 Aug 2023 13:31:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aurelien Jarno , Aleksandar Rikalo , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 7/7] target/mips: Convert Loongson [D]MULT[U].G opcodes to decodetree Date: Thu, 31 Aug 2023 22:30:23 +0200 Message-ID: <20230831203024.87300-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230831203024.87300-1-philmd@linaro.org> References: <20230831203024.87300-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Convert the following opcodes to decodetree: - MULT.G - multiply 32-bit signed integers - MULTU.G - multiply 32-bit unsigned integers - DMULT.G - multiply 64-bit signed integers - DMULTU.G - multiply 64-bit unsigned integers Now that all opcodes from the extension have been converted, we can remove completely gen_loongson_integer() and its 2 calls in decode_opc_special2_legacy() and decode_opc_special3_legacy(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/mips/tcg/godson2.decode | 3 ++ target/mips/tcg/loong-ext.decode | 3 ++ target/mips/tcg/loong_translate.c | 41 +++++++++++++++++ target/mips/tcg/translate.c | 73 +------------------------------ 4 files changed, 49 insertions(+), 71 deletions(-) diff --git a/target/mips/tcg/godson2.decode b/target/mips/tcg/godson2.decode index e3bf6b12e4..86015ac8e5 100644 --- a/target/mips/tcg/godson2.decode +++ b/target/mips/tcg/godson2.decode @@ -13,6 +13,9 @@ @rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv +MULTu_G 011111 ..... ..... ..... 00000 01100- @rs_rt_rd +DMULTu_G 011111 ..... ..... ..... 00000 01110- @rs_rt_rd + DIV_G 011111 ..... ..... ..... 00000 011010 @rs_rt_rd DIVU_G 011111 ..... ..... ..... 00000 011011 @rs_rt_rd DDIV_G 011111 ..... ..... ..... 00000 011110 @rs_rt_rd diff --git a/target/mips/tcg/loong-ext.decode b/target/mips/tcg/loong-ext.decode index d63406e3f4..b05236eb41 100644 --- a/target/mips/tcg/loong-ext.decode +++ b/target/mips/tcg/loong-ext.decode @@ -14,6 +14,9 @@ @rs_rt_rd ...... rs:5 rt:5 rd:5 ..... ...... &muldiv +MULTu_G 011100 ..... ..... ..... 00000 0100-0 @rs_rt_rd +DMULTu_G 011100 ..... ..... ..... 00000 0100-1 @rs_rt_rd + DIV_G 011100 ..... ..... ..... 00000 010100 @rs_rt_rd DDIV_G 011100 ..... ..... ..... 00000 010101 @rs_rt_rd DIVU_G 011100 ..... ..... ..... 00000 010110 @rs_rt_rd diff --git a/target/mips/tcg/loong_translate.c b/target/mips/tcg/loong_translate.c index bddf1cb7aa..c896e64b9e 100644 --- a/target/mips/tcg/loong_translate.c +++ b/target/mips/tcg/loong_translate.c @@ -252,6 +252,47 @@ static bool trans_DMODU_G(DisasContext *s, arg_muldiv *a) return gen_lext_MODU_G(s, a->rt, a->rs, a->rd, true); } +static bool gen_lext_MULT_G(DisasContext *s, int rd, int rs, int rt, + bool is_double) +{ + TCGv t0, t1; + + if (is_double) { + if (TARGET_LONG_BITS != 64) { + return false; + } + check_mips_64(s); + } + + if (rd == 0) { + /* Treat as NOP. */ + return true; + } + + t0 = tcg_temp_new(); + t1 = tcg_temp_new(); + + gen_load_gpr(t0, rs); + gen_load_gpr(t1, rt); + + tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); + if (!is_double) { + tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + } + + return true; +} + +static bool trans_MULTu_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_MULT_G(s, a->rt, a->rs, a->rd, false); +} + +static bool trans_DMULTu_G(DisasContext *s, arg_muldiv *a) +{ + return gen_lext_MULT_G(s, a->rt, a->rs, a->rd, true); +} + bool decode_ext_loongson(DisasContext *ctx, uint32_t insn) { if ((ctx->insn_flags & INSN_LOONGSON2E) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 2cfabb3103..e770840d28 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -328,11 +328,6 @@ enum { OPC_MUL = 0x02 | OPC_SPECIAL2, OPC_MSUB = 0x04 | OPC_SPECIAL2, OPC_MSUBU = 0x05 | OPC_SPECIAL2, - /* Loongson 2F */ - OPC_MULT_G_2F = 0x10 | OPC_SPECIAL2, - OPC_DMULT_G_2F = 0x11 | OPC_SPECIAL2, - OPC_MULTU_G_2F = 0x12 | OPC_SPECIAL2, - OPC_DMULTU_G_2F = 0x13 | OPC_SPECIAL2, /* Misc */ OPC_CLZ = 0x20 | OPC_SPECIAL2, OPC_CLO = 0x21 | OPC_SPECIAL2, @@ -361,12 +356,6 @@ enum { OPC_RDHWR = 0x3B | OPC_SPECIAL3, OPC_GINV = 0x3D | OPC_SPECIAL3, - /* Loongson 2E */ - OPC_MULT_G_2E = 0x18 | OPC_SPECIAL3, - OPC_MULTU_G_2E = 0x19 | OPC_SPECIAL3, - OPC_DMULT_G_2E = 0x1C | OPC_SPECIAL3, - OPC_DMULTU_G_2E = 0x1D | OPC_SPECIAL3, - /* MIPS DSP Load */ OPC_LX_DSP = 0x0A | OPC_SPECIAL3, /* MIPS DSP Arithmetic */ @@ -3582,46 +3571,6 @@ static void gen_cl(DisasContext *ctx, uint32_t opc, } } -/* Godson integer instructions */ -static void gen_loongson_integer(DisasContext *ctx, uint32_t opc, - int rd, int rs, int rt) -{ - TCGv t0, t1; - - if (rd == 0) { - /* Treat as NOP. */ - return; - } - - t0 = tcg_temp_new(); - t1 = tcg_temp_new(); - gen_load_gpr(t0, rs); - gen_load_gpr(t1, rt); - - switch (opc) { - case OPC_MULT_G_2E: - case OPC_MULT_G_2F: - tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); - break; - case OPC_MULTU_G_2E: - case OPC_MULTU_G_2F: - tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); - break; -#if defined(TARGET_MIPS64) - case OPC_DMULT_G_2E: - case OPC_DMULT_G_2F: - tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); - break; - case OPC_DMULTU_G_2E: - case OPC_DMULTU_G_2F: - tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); - break; -#endif - } -} - /* Loongson multimedia instructions */ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt) { @@ -13543,11 +13492,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) case OPC_MUL: gen_arith(ctx, op1, rd, rs, rt); break; - case OPC_MULT_G_2F: - case OPC_MULTU_G_2F: - check_insn(ctx, INSN_LOONGSON2F | ASE_LEXT); - gen_loongson_integer(ctx, op1, rd, rs, rt); - break; case OPC_CLO: case OPC_CLZ: check_insn(ctx, ISA_MIPS_R1); @@ -13572,11 +13516,6 @@ static void decode_opc_special2_legacy(CPUMIPSState *env, DisasContext *ctx) check_mips_64(ctx); gen_cl(ctx, op1, rd, rs); break; - case OPC_DMULT_G_2F: - case OPC_DMULTU_G_2F: - check_insn(ctx, INSN_LOONGSON2F | ASE_LEXT); - gen_loongson_integer(ctx, op1, rd, rs, rt); - break; #endif default: /* Invalid */ MIPS_INVAL("special2_legacy"); @@ -13709,10 +13648,9 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) op1 = MASK_SPECIAL3(ctx->opcode); switch (op1) { - case OPC_MULT_G_2E: - case OPC_MULTU_G_2E: + case OPC_MUL_PH_DSP: /* - * OPC_MULT_G_2E, OPC_ADDUH_QB_DSP, OPC_MUL_PH_DSP have + * OPC_ADDUH_QB_DSP, OPC_MUL_PH_DSP have * the same mask and op1. */ if ((ctx->insn_flags & ASE_DSP_R2) && (op1 == OPC_MUL_PH_DSP)) { @@ -13743,8 +13681,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) gen_reserved_instruction(ctx); break; } - } else if (ctx->insn_flags & INSN_LOONGSON2E) { - gen_loongson_integer(ctx, op1, rd, rs, rt); } else { gen_reserved_instruction(ctx); } @@ -13973,11 +13909,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx) } break; #if defined(TARGET_MIPS64) - case OPC_DMULT_G_2E: - case OPC_DMULTU_G_2E: - check_insn(ctx, INSN_LOONGSON2E); - gen_loongson_integer(ctx, op1, rd, rs, rt); - break; case OPC_ABSQ_S_QH_DSP: op2 = MASK_ABSQ_S_QH(ctx->opcode); switch (op2) {