From patchwork Sun Feb 16 23:09:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 865810 Delivered-To: patch@linaro.org Received: by 2002:a5d:64e6:0:b0:38f:210b:807b with SMTP id g6csp861022wri; Sun, 16 Feb 2025 15:24:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVrlAx46HmdtgmQyD9ko2+7FlBTbGet3/N/qJ5cwZPgG458jqy/kk0uqoqqkNH6gWRHPpCTXw==@linaro.org X-Google-Smtp-Source: AGHT+IGJj5DT7AwBvrrc5kH6Laih9N1xF3XNbOVZl+sR1v2OuSBj3Caox1mMR63cg3m/qeYqhrWD X-Received: by 2002:a05:622a:4888:b0:471:c0e6:d4c5 with SMTP id d75a77b69052e-471dbaba02fmr104865521cf.0.1739748259133; Sun, 16 Feb 2025 15:24:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739748259; cv=none; d=google.com; s=arc-20240605; b=gP5PCE3PbUuq78dqokGkrJWk6X0yoljvhf9T3GRtQFoV41Xa9GZpptb/5l8Z+xbESj KmSLMOJSBrbEEO98k2oYtFcfhRwz8hRb1EvABN4iUj/tbZXtJOYjvobc5wuKSOFP1QF9 Y53G1Zjj/9FD+qWAVs6gQuWIugB1YLJhIM9i8tX+v2Tl1u9+8VONzC7alLfM5zOAZgqN 1KoB1nvv1+jEgLzA08A63LM7XfMS9rFY7m18I6AEsBOV9L8gFS516nV99mA8rWSXbjgc 1TGkzkxmdbcRGpLSvDlvjQOln2MolYgQKQopIawA8jCjNFuIsl1MUj77FlB0IoDg4GCM GOrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=LqmYFS+mKTMDWnN+D+k8G+NOtETf6n0r4FRDF3yV52U=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ESvZ0w4ldSIoH7FdQyPem4FkjlRQmd3PBtN/3MfBzzAXUi9jooF4Hju9h8W1cKyuBJ BwTSafdmyD2LTAijDbQNZsWP0hQWySufwHU39dHgNjkAmiRuO+DC/f48vunNydSCmvHQ PH1Oo3nJ5a1RKhhysnEn7cYWCNEJQF/ehqmaKSqyk+6tjuXULDKBxKQaHHJDDEXkHJUH dP468zJMqG+aYf4gBbymBfiyv4gMubMgliOXeYMt2GAXAqW1fCFjqnuC+6waZaR4mAs9 eylDX1PbFopwKAznRI6ulNUSPYh+ZN0LYxyZICH0eVt7jvYEoOtD5czijCHqqjZ/bUo2 srEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mju1/b+n"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-471c2b5f5d7si74452061cf.525.2025.02.16.15.24.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Feb 2025 15:24:19 -0800 (PST) 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="mju1/b+n"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjnxC-0005hc-0G; Sun, 16 Feb 2025 18:21:39 -0500 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 1tjnwf-0004OP-T0 for qemu-devel@nongnu.org; Sun, 16 Feb 2025 18:21:08 -0500 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tjnwb-0006SS-PL for qemu-devel@nongnu.org; Sun, 16 Feb 2025 18:21:04 -0500 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2fc737aeeb1so494036a91.3 for ; Sun, 16 Feb 2025 15:20:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739748059; x=1740352859; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LqmYFS+mKTMDWnN+D+k8G+NOtETf6n0r4FRDF3yV52U=; b=mju1/b+nByUdSfZeMEo2lEQMjkIlySv//yVkKAUTasBYOEEi3z+XoKjalbPWYIJ06/ THCJXpZGhJxhClAuDgzlqXm2wmiBPdf+e+FYJS8rGdy8OhTiTAlA9SXTnsnnYtmgwZLp 6/ukmPMW9vPWqHqJk4xMuMFwDMD2ccby52BDJvclnxz3sgiy7VfwP76pIMp90mMFeq95 FQIakfBXRIpr+dnkn9pVGG45HH81bceFRjPL4xC2LyVu5UBmxtZMoUZrwE+yIqdr+rYu sB3cZCnWLvyqbalaKZtJbWjxPZN2aElxcQnV8HMVuLt37Du2kzM70xym3zvi3WD880JQ UtGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739748059; x=1740352859; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LqmYFS+mKTMDWnN+D+k8G+NOtETf6n0r4FRDF3yV52U=; b=sU3nOORvTCme7z95LpobEsOi85DVRI0wppAdaYkb/rfMCE9OrWLpOXs0AQR55FE3o3 uBiZUwC825JcT1javrV/XhOS9L8aBmJ7tGk4eCsoZBUJVZW3+Ev2ILGfF3QCk7sBSBOg cWmliX4ROerGMhiU9OINWbyoh0wgqvJ5Xrs8roNPkEccv/jSwRkQ1j0MHov/Zz2tdBeW M7/FzRlFbkGbdG4RTla02Wtcn6RUOlAEZIZjwaax8aJFdILarpg67f+rIsJQUy8MSLM3 T8Jgx+tu5dk/QwSIz0f4Rv2o9nx4RkwbcUXb1pSFchGv3A3XhK3oXHMk2YNDMfVaUEgx kLGA== X-Gm-Message-State: AOJu0YzQi83VhuQkVRqULxrI8Vq0RcIgyocFQDx4sJ0X9Hf/j+V9HNXr VzR7tH+VTUyz+gQ13R4UfDhSqD3QwYRliGwv7OXw/KzClMc4WvN5AKBr06fLZeRbItTSrsZiKjr 6 X-Gm-Gg: ASbGnctSGuf7GT/rs62WgM0W3V3GyzNhHUX6m0M9fMRSn99k+gRhbSkjYJC71WgorcA +9je4Yqk1jiZC5TCkdNw4DhmKu8xrXPSXCn27rcdqAPdGdaWtpUNTkh8alUwKlG9X42MlEbER3D +8d7CJhq1X099unA8KJvrmwjqY8nEG0J1fNjlnh9BvOZTRc8hyUd04l0mk771bGIrHyTox7/6DD w5LTfjh8j3+PzOcxsOCjtHG3mMPpIsmu1ozPsLFcXxqbA1CpUtXc9rVN4lS3Ol36uQp6BpLprqO q4myDkXPVz5f5GPtRikzcgwmqLkGN/WsREKZYehVEkijV6Y= X-Received: by 2002:a17:90a:e7d1:b0:2f2:ab09:c256 with SMTP id 98e67ed59e1d1-2fc41153ec4mr12669336a91.33.1739748058817; Sun, 16 Feb 2025 15:20:58 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fc13ad4391sm6783744a91.27.2025.02.16.15.20.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2025 15:20:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 137/162] tcg/ppc: Remove support for add2/sub2 Date: Sun, 16 Feb 2025 15:09:46 -0800 Message-ID: <20250216231012.2808572-138-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250216231012.2808572-1-richard.henderson@linaro.org> References: <20250216231012.2808572-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.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 We have replaced this with support for add/sub carry. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target-con-set.h | 2 -- tcg/ppc/tcg-target-has.h | 11 +++---- tcg/ppc/tcg-target.c.inc | 60 ------------------------------------ 3 files changed, 4 insertions(+), 69 deletions(-) diff --git a/tcg/ppc/tcg-target-con-set.h b/tcg/ppc/tcg-target-con-set.h index 9ea26c40ae..da7a383bff 100644 --- a/tcg/ppc/tcg-target-con-set.h +++ b/tcg/ppc/tcg-target-con-set.h @@ -41,5 +41,3 @@ C_O1_I4(r, r, r, rU, rC) C_O2_I1(r, r, r) C_N1O1_I1(o, m, r) C_O2_I2(r, r, r, r) -C_O2_I4(r, r, rI, rZM, r, r) -C_O2_I4(r, r, r, r, rI, rZM) diff --git a/tcg/ppc/tcg-target-has.h b/tcg/ppc/tcg-target-has.h index 8d832ce99c..4dda668706 100644 --- a/tcg/ppc/tcg-target-has.h +++ b/tcg/ppc/tcg-target-has.h @@ -18,16 +18,13 @@ /* optional instructions */ #define TCG_TARGET_HAS_qemu_st8_i32 0 - -#if TCG_TARGET_REG_BITS == 64 #define TCG_TARGET_HAS_add2_i32 0 #define TCG_TARGET_HAS_sub2_i32 0 + +#if TCG_TARGET_REG_BITS == 64 #define TCG_TARGET_HAS_extr_i64_i32 0 -#define TCG_TARGET_HAS_add2_i64 1 -#define TCG_TARGET_HAS_sub2_i64 1 -#else -#define TCG_TARGET_HAS_add2_i32 1 -#define TCG_TARGET_HAS_sub2_i32 1 +#define TCG_TARGET_HAS_add2_i64 0 +#define TCG_TARGET_HAS_sub2_i64 0 #endif #define TCG_TARGET_HAS_qemu_ldst_i128 \ diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 0b151db0e4..91df9610ec 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -3663,8 +3663,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type, const TCGArg args[TCG_MAX_OP_ARGS], const int const_args[TCG_MAX_OP_ARGS]) { - TCGArg a0, a1; - switch (opc) { case INDEX_op_goto_ptr: tcg_out32(s, MTSPR | RS(args[0]) | CTR); @@ -3760,57 +3758,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, TCGType type, tcg_out_qemu_ldst_i128(s, args[0], args[1], args[2], args[3], false); break; -#if TCG_TARGET_REG_BITS == 64 - case INDEX_op_add2_i64: -#else - case INDEX_op_add2_i32: -#endif - /* Note that the CA bit is defined based on the word size of the - environment. So in 64-bit mode it's always carry-out of bit 63. - The fallback code using deposit works just as well for 32-bit. */ - a0 = args[0], a1 = args[1]; - if (a0 == args[3] || (!const_args[5] && a0 == args[5])) { - a0 = TCG_REG_R0; - } - if (const_args[4]) { - tcg_out32(s, ADDIC | TAI(a0, args[2], args[4])); - } else { - tcg_out32(s, ADDC | TAB(a0, args[2], args[4])); - } - if (const_args[5]) { - tcg_out32(s, (args[5] ? ADDME : ADDZE) | RT(a1) | RA(args[3])); - } else { - tcg_out32(s, ADDE | TAB(a1, args[3], args[5])); - } - if (a0 != args[0]) { - tcg_out_mov(s, TCG_TYPE_REG, args[0], a0); - } - break; - -#if TCG_TARGET_REG_BITS == 64 - case INDEX_op_sub2_i64: -#else - case INDEX_op_sub2_i32: -#endif - a0 = args[0], a1 = args[1]; - if (a0 == args[5] || (!const_args[3] && a0 == args[3])) { - a0 = TCG_REG_R0; - } - if (const_args[2]) { - tcg_out32(s, SUBFIC | TAI(a0, args[4], args[2])); - } else { - tcg_out32(s, SUBFC | TAB(a0, args[4], args[2])); - } - if (const_args[3]) { - tcg_out32(s, (args[3] ? SUBFME : SUBFZE) | RT(a1) | RA(args[5])); - } else { - tcg_out32(s, SUBFE | TAB(a1, args[5], args[3])); - } - if (a0 != args[0]) { - tcg_out_mov(s, TCG_TYPE_REG, args[0], a0); - } - break; - case INDEX_op_mb: tcg_out_mb(s, args[0]); break; @@ -4456,13 +4403,6 @@ tcg_target_op_def(TCGOpcode op, TCGType type, unsigned flags) case INDEX_op_st_i64: return C_O0_I2(r, r); - case INDEX_op_add2_i64: - case INDEX_op_add2_i32: - return C_O2_I4(r, r, r, r, rI, rZM); - case INDEX_op_sub2_i64: - case INDEX_op_sub2_i32: - return C_O2_I4(r, r, rI, rZM, r, r); - case INDEX_op_qemu_ld_i32: return C_O1_I1(r, r); case INDEX_op_qemu_ld_i64: