From patchwork Wed Oct 18 22:25:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 735160 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp1238375wro; Wed, 18 Oct 2023 15:32:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2GJqaItHVNbCvhmlHsOFgjn1cu7N2zxSF6og4luJiO/LrLcYrqlmXGCtdvQ72hUpvkWqs X-Received: by 2002:a05:6214:d0c:b0:66d:f75:bd1a with SMTP id 12-20020a0562140d0c00b0066d0f75bd1amr506039qvh.65.1697668360028; Wed, 18 Oct 2023 15:32:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697668360; cv=none; d=google.com; s=arc-20160816; b=y7cVgoQ6sn1TMzyrrLi3WpGSkOVYJISjFU1xiHf4VqZ3Btk22ByFUH1CWUY/HyPY4v pKJ5C1j5pX85x6fKWdXWyo3beBzphuMgcugI2ROXMLmS90FKaii1Wd0NcFnXQ5KNq/0f APnUOXq8Q2zwrek3x1V+OroRBV/PdWQnrJkuVrmBl7PacaW7Dns4TztFpGzdt7XU41X1 Xe9lIvpEcsJuknvJLzDOdx9ivgFPiGxBMSsCITQ0ambvjqozrDf+TqH1hxtPN8UmDFvY cc5oUpfVzb2pg14MoqFWnPSlWT0TdsSnSPnqF3Un6Zj90B8zJV3p5ttDAhFPz9Owda7+ Whww== 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:to:from :dkim-signature; bh=3KCQIgln5kN/33Jyz8B+r1A500q3A4Jm4TEcmcp8vS8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=YuKUw6on+GbtaNimYcITLiTlY7J4rMqcoRhHpo9ydnRbGwJlG23DAvEfUNSOoXdJyh J33YfzR3yly72vS2vu6it7DzkoqpTiRU7TgcGvhlRiwMNUKb04VPh6q4+K5+Y3jvx1+2 NU+Vwv8TeKb8EXQ9ylBhGDq7FTQhNtOR/BVeaq5+Pfqp7WNtWuOiBA2uM6epMLJ6Tic1 DUaCFGiP0uhJ8AodQrp2Zpd+jj9BgCcns7d63MEsXYKMIsh1TS6v8LKsokk+YLQX3ymR yq4wPp75qCDjnO0fSaTLJW80hkRrc58vWAozMc8pkat5DCKJg/4ElsSId539bDA43Op9 wbnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mVigu8Kp; 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 k13-20020a05621414ed00b0066d0a15a2ffsi663724qvw.322.2023.10.18.15.32.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Oct 2023 15:32:40 -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=mVigu8Kp; 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 1qtEzP-00083Y-7K; Wed, 18 Oct 2023 18:26:07 -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 1qtEzM-000825-W5 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 18:26:05 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtEzL-0002S3-99 for qemu-devel@nongnu.org; Wed, 18 Oct 2023 18:26:04 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1c5cd27b1acso62204985ad.2 for ; Wed, 18 Oct 2023 15:26:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697667962; x=1698272762; 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=3KCQIgln5kN/33Jyz8B+r1A500q3A4Jm4TEcmcp8vS8=; b=mVigu8Kp9SA8yT2LI8jyFYPC+KY3z7/tBOTkMPNiA0G6XVF8hVcfPJKj6Ax83ZZbHy adMQZMOXWMruGl5kgbvAvIhhwf8Swi2mKEnDAa8EA6pyLpuN4IKtgnm+71g7UdtYRria dp6KbGZ8JBmKYd9b+DhJqBxXzJ6Zdyyzh52nzBby4HwDIAAVwdZPkusSjwHAaiouPVAo EcSn5amWN6b+EC9U/PsK2G3OJmc+yDec3cvVJ7X6IJNsE3J5CUyX8/ZlYftsz0O7B+iU 9UIF0oeR7/CWdch0nTkXgKzF5uvfWAktb5zCOsAPUgDMyMF8uVFRVmPUpKEimxdRuGrW taKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697667962; x=1698272762; 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=3KCQIgln5kN/33Jyz8B+r1A500q3A4Jm4TEcmcp8vS8=; b=UFMB0ziXz5nQdGz3F6QBinVSfEk36kDENGrOOxd0RbaBI8Wta2no3sH/7QzcnLZaUL 8Jz/r1SBPt1bmuBdyQTBMBqhsm8bJXi9kaQr3ZEaEf3I6hqcWNTlfRZk5Z1H9I1mK5gI OWc9C20FPZfwKTCiy7kOnDQYhLD6Lqyec/rnUM8owdBIft6FIK1b3QXXJNM/uw8XVVuy 5ZO9exznjfS0iONVk1SY/Lvx3Okf/RM/xwFlZu183cxeMI8HaNcG3WcDHgIC7y+uPz05 uwETyus5+fR+RfoSau/jciQA3wVSoQOKnMLwzIOnwx6qSBUuneTl1sk/OLZoLMLWVRwy twyQ== X-Gm-Message-State: AOJu0YznNYsCegk5nkvToc5WgZ1uY021K1KOSKPa/PMV2w5afZJtiXTz boNmM0eCMsoumRNZpjeMXht7TqYlFUxeAWNOpM8= X-Received: by 2002:a17:902:ec85:b0:1b8:954c:1f6 with SMTP id x5-20020a170902ec8500b001b8954c01f6mr669586plg.36.1697667961760; Wed, 18 Oct 2023 15:26:01 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id 13-20020a170902c24d00b001b9d95945afsm431058plg.155.2023.10.18.15.26.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 15:26:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 03/29] tcg/ppc: Reinterpret tb-relative to TB+4 Date: Wed, 18 Oct 2023 15:25:31 -0700 Message-Id: <20231018222557.1562065-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231018222557.1562065-1-richard.henderson@linaro.org> References: <20231018222557.1562065-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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 It saves one insn to load the address of TB+4 instead of TB. Adjust all of the indexing to match. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.c.inc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 9197cfd6c6..aafbf2db4e 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -215,6 +215,12 @@ static const int tcg_target_callee_save_regs[] = { TCG_REG_R31 }; +/* For PPC, we use TB+4 instead of TB as the base. */ +static inline ptrdiff_t ppc_tbrel_diff(TCGContext *s, const void *target) +{ + return tcg_tbrel_diff(s, target) - 4; +} + static inline bool in_range_b(tcg_target_long target) { return target == sextract64(target, 0, 26); @@ -991,7 +997,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, } /* Load addresses within the TB with one insn. */ - tb_diff = tcg_tbrel_diff(s, (void *)arg); + tb_diff = ppc_tbrel_diff(s, (void *)arg); if (!in_prologue && USE_REG_TB && tb_diff == (int16_t)tb_diff) { tcg_out32(s, ADDI | TAI(ret, TCG_REG_TB, tb_diff)); return; @@ -1044,7 +1050,7 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, /* Use the constant pool, if possible. */ if (!in_prologue && USE_REG_TB) { new_pool_label(s, arg, R_PPC_ADDR16, s->code_ptr, - tcg_tbrel_diff(s, NULL)); + ppc_tbrel_diff(s, NULL)); tcg_out32(s, LD | TAI(ret, TCG_REG_TB, 0)); return; } @@ -1104,7 +1110,7 @@ static void tcg_out_dupi_vec(TCGContext *s, TCGType type, unsigned vece, */ if (USE_REG_TB) { rel = R_PPC_ADDR16; - add = tcg_tbrel_diff(s, NULL); + add = ppc_tbrel_diff(s, NULL); } else { rel = R_PPC_ADDR32; add = 0; @@ -2531,7 +2537,6 @@ static void tcg_out_tb_start(TCGContext *s) /* bcl 20,31,$+4 (preferred form for getting nia) */ tcg_out32(s, BC | BO_ALWAYS | BI(7, CR_SO) | 0x4 | LK); tcg_out32(s, MFSPR | RT(TCG_REG_TB) | LR); - tcg_out32(s, ADDI | TAI(TCG_REG_TB, TCG_REG_TB, -4)); } } @@ -2551,7 +2556,7 @@ static void tcg_out_goto_tb(TCGContext *s, int which) /* When branch is out of range, fall through to indirect. */ if (USE_REG_TB) { - ptrdiff_t offset = tcg_tbrel_diff(s, (void *)ptr); + ptrdiff_t offset = ppc_tbrel_diff(s, (void *)ptr); tcg_out_mem_long(s, LD, LDX, TCG_REG_TMP1, TCG_REG_TB, offset); } else { tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP1, ptr - (int16_t)ptr);