From nobody Tue May 7 15:54:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641236217372442.1722906464315; Mon, 3 Jan 2022 10:56:57 -0800 (PST) Received: from localhost ([::1]:45704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4SVs-0005h2-Dr for importer@patchew.org; Mon, 03 Jan 2022 13:56:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4SSq-0007G2-OG; Mon, 03 Jan 2022 13:53:48 -0500 Received: from [2607:f8b0:4864:20::831] (port=46688 helo=mail-qt1-x831.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4SSn-0006GD-So; Mon, 03 Jan 2022 13:53:47 -0500 Received: by mail-qt1-x831.google.com with SMTP id m25so31284726qtq.13; Mon, 03 Jan 2022 10:53:45 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:f4d8:aa07:335f:99e0:a6e7]) by smtp.gmail.com with ESMTPSA id w9sm29002867qko.71.2022.01.03.10.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 10:53:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ONhwFubTJrewF85Qam/ZsiMfJoEJAy9vmUnumANzWDc=; b=NUixM5UkM4pWDVnXQa1AceSRgeTQSqXQJwRbkMMvhYknnsluPDF/hxhZfbmP2uRQZ2 Xb+b9DxZudPwBLPce/JsSqqgiDop5FLQOjzT9hXcu4gIPVJQPcoi27cK/6XyCPg4Ykt+ htWCO5lMRqkL8d2tl9fAAj/Mt/P71o9kMB/iO5ABOU9wF+dA1Vjm8R4WCg63IPwBCwjP piN2ZL2GYfQObJXa8WsYLmFMPdjVF5rWcbCgP31fHut6cGzQnCJzGaKNiyMnWjPs7zlo Q2ySlCvDobQ/9znweAyI/k7VuY+aZbyrZkGDz6bme9ltgC0ApZtqBf6oBCHK/goeoXeu OviA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ONhwFubTJrewF85Qam/ZsiMfJoEJAy9vmUnumANzWDc=; b=8E0hPnZyt7xqm8WbSwLHhbAlEc0qvKCyUqdJFyD2/Gxl/6P1yLs2+Pur8iZXloZ0Oy cogRqmn5nqumQcU4NjMsZ6ruqf+koheBIugNSwXtXI6gtYDRC63bwWilEgj99pX5gxnk 3fdZpXl53Iex7R77U9Mku47vLQNF/+bhcUEg9kx2zMwGrlWGUDhurgvfvA2Aia4WXEvx c7vm3VsItTZKsPnTV3DIPh6mgdWTyLzMM23WSOb/NXW7lvOgQ3BSrsnypR/YAdcqhufU gbzr6u6blBWqMgChQ8GnsP7/bg/Ctimurzo0vSKViHalJ+FLX3c5342RljqHhDVP+VvG p//Q== X-Gm-Message-State: AOAM532ZFz2bRri1tE3RE/gaDFBLrARCAeoM+WM+V4g71Zus0YzCWiXM CkQBEnXMikf+KKWSUqwdNU0d/8+xWhw= X-Google-Smtp-Source: ABdhPJwBtpIyfHp0KTAQ97onLimlS69WKBnt4MozNeeOtqRby/cmP2wse+osRu4HZd7XE3VUlXr1fw== X-Received: by 2002:ac8:5842:: with SMTP id h2mr41138732qth.244.1641236024807; Mon, 03 Jan 2022 10:53:44 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v2 1/5] target/ppc: Cache per-pmc insn and cycle count settings Date: Mon, 3 Jan 2022 15:53:28 -0300 Message-Id: <20220103185332.117878-2-danielhb413@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103185332.117878-1-danielhb413@gmail.com> References: <20220103185332.117878-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::831 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::831; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x831.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: richard.henderson@linaro.org, Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641236217799100001 Content-Type: text/plain; charset="utf-8" From: Richard Henderson This is the combination of frozen bit and counter type, on a per counter basis. So far this is only used by HFLAGS_INSN_CNT, but will be used more later. Signed-off-by: Richard Henderson [danielhb: fixed PMC4 cyc_cnt shift and insn run latch code] Signed-off-by: Daniel Henrique Barboza --- target/ppc/cpu.h | 3 +++ target/ppc/cpu_init.c | 1 + target/ppc/helper_regs.c | 2 +- target/ppc/machine.c | 2 ++ target/ppc/power8-pmu.c | 53 +++++++++++++++++++++++++++++++--------- target/ppc/power8-pmu.h | 14 +++++------ 6 files changed, 54 insertions(+), 21 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index fc66c3561d..a297a52168 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1144,6 +1144,9 @@ struct CPUPPCState { /* Other registers */ target_ulong spr[1024]; /* special purpose registers */ ppc_spr_t spr_cb[1024]; + /* Composite status for PMC[1-5] enabled and counting insns or cycles.= */ + uint8_t pmc_ins_cnt; + uint8_t pmc_cyc_cnt; /* Vector status and control register, minus VSCR_SAT */ uint32_t vscr; /* VSX registers (including FP and AVR) */ diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 06ef15cd9e..63f9babfee 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -8313,6 +8313,7 @@ static void ppc_cpu_reset(DeviceState *dev) #endif /* CONFIG_TCG */ #endif =20 + pmu_update_summaries(env); hreg_compute_hflags(env); env->reserve_addr =3D (target_ulong)-1ULL; /* Be sure no exception or interrupt is pending */ diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c index b847928842..8671b7bb69 100644 --- a/target/ppc/helper_regs.c +++ b/target/ppc/helper_regs.c @@ -123,7 +123,7 @@ static uint32_t hreg_compute_hflags_value(CPUPPCState *= env) } =20 #if defined(TARGET_PPC64) - if (pmu_insn_cnt_enabled(env)) { + if (env->pmc_ins_cnt) { hflags |=3D 1 << HFLAGS_INSN_CNT; } #endif diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 93972df58e..756d8de5d8 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -8,6 +8,7 @@ #include "qapi/error.h" #include "qemu/main-loop.h" #include "kvm_ppc.h" +#include "power8-pmu.h" =20 static void post_load_update_msr(CPUPPCState *env) { @@ -19,6 +20,7 @@ static void post_load_update_msr(CPUPPCState *env) */ env->msr ^=3D env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB); ppc_store_msr(env, msr); + pmu_update_summaries(env); } =20 static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 08d1902cd5..4fce6e8de8 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -11,8 +11,6 @@ */ =20 #include "qemu/osdep.h" - -#include "power8-pmu.h" #include "cpu.h" #include "helper_regs.h" #include "exec/exec-all.h" @@ -20,6 +18,7 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "hw/ppc/ppc.h" +#include "power8-pmu.h" =20 #if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) =20 @@ -121,18 +120,47 @@ static PMUEventType pmc_get_event(CPUPPCState *env, i= nt sprn) return evt_type; } =20 -bool pmu_insn_cnt_enabled(CPUPPCState *env) +void pmu_update_summaries(CPUPPCState *env) { - int sprn; - - for (sprn =3D SPR_POWER_PMC1; sprn <=3D SPR_POWER_PMC5; sprn++) { - if (pmc_get_event(env, sprn) =3D=3D PMU_EVENT_INSTRUCTIONS || - pmc_get_event(env, sprn) =3D=3D PMU_EVENT_INSN_RUN_LATCH) { - return true; + target_ulong mmcr0 =3D env->spr[SPR_POWER_MMCR0]; + target_ulong mmcr1 =3D env->spr[SPR_POWER_MMCR1]; + int ins_cnt =3D 0; + int cyc_cnt =3D 0; + + if (!(mmcr0 & MMCR0_FC14) && mmcr1 !=3D 0) { + target_ulong sel; + + sel =3D extract64(mmcr1, MMCR1_PMC1EVT_EXTR, MMCR1_EVT_SIZE); + switch (sel) { + case 0x02: + case 0xfe: + ins_cnt |=3D 1 << 1; + break; + case 0x1e: + case 0xf0: + cyc_cnt |=3D 1 << 1; + break; } + + sel =3D extract64(mmcr1, MMCR1_PMC2EVT_EXTR, MMCR1_EVT_SIZE); + ins_cnt |=3D (sel =3D=3D 0x02) << 2; + cyc_cnt |=3D (sel =3D=3D 0x1e) << 2; + + sel =3D extract64(mmcr1, MMCR1_PMC3EVT_EXTR, MMCR1_EVT_SIZE); + ins_cnt |=3D (sel =3D=3D 0x02) << 3; + cyc_cnt |=3D (sel =3D=3D 0x1e) << 3; + + sel =3D extract64(mmcr1, MMCR1_PMC4EVT_EXTR, MMCR1_EVT_SIZE); + ins_cnt |=3D ((sel =3D=3D 0xfa) || (sel =3D=3D 0x2)) << 4; + cyc_cnt |=3D (sel =3D=3D 0x1e) << 4; } =20 - return false; + ins_cnt |=3D !(mmcr0 & MMCR0_FC56) << 5; + cyc_cnt |=3D !(mmcr0 & MMCR0_FC56) << 6; + + env->pmc_ins_cnt =3D ins_cnt; + env->pmc_cyc_cnt =3D cyc_cnt; + env->hflags =3D deposit32(env->hflags, HFLAGS_INSN_CNT, 1, ins_cnt != =3D 0); } =20 static bool pmu_increment_insns(CPUPPCState *env, uint32_t num_insns) @@ -264,8 +292,9 @@ void helper_store_mmcr0(CPUPPCState *env, target_ulong = value) =20 env->spr[SPR_POWER_MMCR0] =3D value; =20 - /* MMCR0 writes can change HFLAGS_PMCCCLEAR and HFLAGS_INSN_CNT */ + /* MMCR0 writes can change HFLAGS_PMCC[01] and HFLAGS_INSN_CNT */ hreg_compute_hflags(env); + pmu_update_summaries(env); =20 /* Update cycle overflow timers with the current MMCR0 state */ pmu_update_overflow_timers(env); @@ -278,7 +307,7 @@ void helper_store_mmcr1(CPUPPCState *env, uint64_t valu= e) env->spr[SPR_POWER_MMCR1] =3D value; =20 /* MMCR1 writes can change HFLAGS_INSN_CNT */ - hreg_compute_hflags(env); + pmu_update_summaries(env); } =20 target_ulong helper_read_pmc(CPUPPCState *env, uint32_t sprn) diff --git a/target/ppc/power8-pmu.h b/target/ppc/power8-pmu.h index 3ee4b4cda5..a839199561 100644 --- a/target/ppc/power8-pmu.h +++ b/target/ppc/power8-pmu.h @@ -13,14 +13,12 @@ #ifndef POWER8_PMU #define POWER8_PMU =20 -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/exec-all.h" -#include "exec/helper-proto.h" -#include "qemu/error-report.h" -#include "qemu/main-loop.h" - void cpu_ppc_pmu_init(CPUPPCState *env); -bool pmu_insn_cnt_enabled(CPUPPCState *env); + +#if defined(TARGET_PPC64) && !defined(CONFIG_USER_ONLY) +void pmu_update_summaries(CPUPPCState *env); +#else +static inline void pmu_update_summaries(CPUPPCState *env) { } +#endif =20 #endif --=20 2.33.1 From nobody Tue May 7 15:54:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641236093841432.5139904721607; Mon, 3 Jan 2022 10:54:53 -0800 (PST) Received: from localhost ([::1]:38800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4STs-00011S-Nr for importer@patchew.org; Mon, 03 Jan 2022 13:54:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4SSt-0007HP-11; Mon, 03 Jan 2022 13:53:51 -0500 Received: from [2607:f8b0:4864:20::831] (port=34518 helo=mail-qt1-x831.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4SSr-0006Gd-9H; Mon, 03 Jan 2022 13:53:50 -0500 Received: by mail-qt1-x831.google.com with SMTP id o17so31362354qtk.1; Mon, 03 Jan 2022 10:53:47 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:f4d8:aa07:335f:99e0:a6e7]) by smtp.gmail.com with ESMTPSA id w9sm29002867qko.71.2022.01.03.10.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 10:53:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L0OeVrJS6kMoBDCVPLb8crS8ryqPaT8r+Qs7TZGVG+E=; b=hLmfG5nWYwLuD93aip9YqwZMZvfB0u+7SZ7WbCST5GodFejdzKtt3bMEQhwST3f8TY YKuFs1CXmiSc8Tjjqg6cnc3XmtepACq4KOqc0ICesJCZZEa9bSOiy3dUTnml0t3GkVNd sCyB6O5K9YlgwMtlIgJUo7YQmnhqkN7V3jGLc1b9cz9tXd1WEv0X2ItTkwzUm/2t7blT LNogk9piBfl1Nh66rpuXJ0/Nxfc9DttiO1sydkm326VLQZbBvi5liZxLENbmztySRc2J NXnIT/7UnXuqhd6jr2V7xJNNTqqu7nW8nu2hjihyhJMUtmtXzJG57fWnftkZXBzxaSaF AYow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L0OeVrJS6kMoBDCVPLb8crS8ryqPaT8r+Qs7TZGVG+E=; b=mR1g7eeBBP3drIFU3x5xxXBOAKP9AaXaRL1my10mhZV1TLcnfcoqmu8egftSRjZkIO gxUWu1r0QpSEbcCvcd4LXnkqkpifDkdnxi/GAd6C7COPW3VtmGdVIexSwukCRUpwNmty iDeKfqSrqHx8LXB6dSKu2KbO2kEcha3cIYQ28j9ChApP4oGm4bdfpOdIogfnizaXtowz tQ+KDzoDKW+8//pWUOnRD3Q4OLAyFk0r7eG4dRVfa32nQD1riV0uWdRHWJ3+8B/t0amp Brc7uYjP62FT3lul3es9hUIQR9gw7k/M6v07LNZ2Hv3Ae8kYZLTCA2cMph9DhxGSp1mu Mr4w== X-Gm-Message-State: AOAM533+6dONeuz8efwq4zuiEX08tZk4hjikFIuITR6IBsX1cCiiuJzo GHUAAswmv4eQ7QWj9GwdCGY8WjypoRE= X-Google-Smtp-Source: ABdhPJy2wpJaPz2Nz2tW58e7+WZxXrcz/z3/KppVkjEgpFWuR5hsluWDpugw2uEldyvGNicKio8JsQ== X-Received: by 2002:ac8:7f8b:: with SMTP id z11mr41026718qtj.513.1641236027006; Mon, 03 Jan 2022 10:53:47 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v2 2/5] target/ppc: Rewrite pmu_increment_insns Date: Mon, 3 Jan 2022 15:53:29 -0300 Message-Id: <20220103185332.117878-3-danielhb413@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103185332.117878-1-danielhb413@gmail.com> References: <20220103185332.117878-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::831 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::831; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x831.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: richard.henderson@linaro.org, qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641236096335100001 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Use the cached pmc_ins_cnt value. Unroll the loop over the different PMC counters. Treat the PMC4 run-latch specially. Signed-off-by: Richard Henderson --- target/ppc/power8-pmu.c | 78 ++++++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 4fce6e8de8..8f01934c15 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -165,45 +165,65 @@ void pmu_update_summaries(CPUPPCState *env) =20 static bool pmu_increment_insns(CPUPPCState *env, uint32_t num_insns) { + target_ulong mmcr0 =3D env->spr[SPR_POWER_MMCR0]; + unsigned ins_cnt =3D env->pmc_ins_cnt; bool overflow_triggered =3D false; - int sprn; - - /* PMC6 never counts instructions */ - for (sprn =3D SPR_POWER_PMC1; sprn <=3D SPR_POWER_PMC5; sprn++) { - PMUEventType evt_type =3D pmc_get_event(env, sprn); - bool insn_event =3D evt_type =3D=3D PMU_EVENT_INSTRUCTIONS || - evt_type =3D=3D PMU_EVENT_INSN_RUN_LATCH; - - if (pmc_is_inactive(env, sprn) || !insn_event) { - continue; + target_ulong tmp; + + if (unlikely(ins_cnt & 0x1e)) { + if (ins_cnt & (1 << 1)) { + tmp =3D env->spr[SPR_POWER_PMC1]; + tmp +=3D num_insns; + if (tmp >=3D PMC_COUNTER_NEGATIVE_VAL && (mmcr0 & MMCR0_PMC1CE= )) { + tmp =3D PMC_COUNTER_NEGATIVE_VAL; + overflow_triggered =3D true; + } + env->spr[SPR_POWER_PMC1] =3D tmp; } =20 - if (evt_type =3D=3D PMU_EVENT_INSTRUCTIONS) { - env->spr[sprn] +=3D num_insns; + if (ins_cnt & (1 << 2)) { + tmp =3D env->spr[SPR_POWER_PMC2]; + tmp +=3D num_insns; + if (tmp >=3D PMC_COUNTER_NEGATIVE_VAL && (mmcr0 & MMCR0_PMCjCE= )) { + tmp =3D PMC_COUNTER_NEGATIVE_VAL; + overflow_triggered =3D true; + } + env->spr[SPR_POWER_PMC2] =3D tmp; } =20 - if (evt_type =3D=3D PMU_EVENT_INSN_RUN_LATCH && - env->spr[SPR_CTRL] & CTRL_RUN) { - env->spr[sprn] +=3D num_insns; + if (ins_cnt & (1 << 3)) { + tmp =3D env->spr[SPR_POWER_PMC3]; + tmp +=3D num_insns; + if (tmp >=3D PMC_COUNTER_NEGATIVE_VAL && (mmcr0 & MMCR0_PMCjCE= )) { + tmp =3D PMC_COUNTER_NEGATIVE_VAL; + overflow_triggered =3D true; + } + env->spr[SPR_POWER_PMC3] =3D tmp; } =20 - if (env->spr[sprn] >=3D PMC_COUNTER_NEGATIVE_VAL && - pmc_has_overflow_enabled(env, sprn)) { + if (ins_cnt & (1 << 4)) { + target_ulong mmcr1 =3D env->spr[SPR_POWER_MMCR1]; + int sel =3D extract64(mmcr1, MMCR1_PMC4EVT_EXTR, MMCR1_EVT_SIZ= E); + if (sel =3D=3D 0x02 || (env->spr[SPR_CTRL] & CTRL_RUN)) { + tmp =3D env->spr[SPR_POWER_PMC4]; + tmp +=3D num_insns; + if (tmp >=3D PMC_COUNTER_NEGATIVE_VAL && (mmcr0 & MMCR0_PM= CjCE)) { + tmp =3D PMC_COUNTER_NEGATIVE_VAL; + overflow_triggered =3D true; + } + env->spr[SPR_POWER_PMC4] =3D tmp; + } + } + } =20 + if (ins_cnt & (1 << 5)) { + tmp =3D env->spr[SPR_POWER_PMC5]; + tmp +=3D num_insns; + if (tmp >=3D PMC_COUNTER_NEGATIVE_VAL && (mmcr0 & MMCR0_PMCjCE)) { + tmp =3D PMC_COUNTER_NEGATIVE_VAL; overflow_triggered =3D true; - - /* - * The real PMU will always trigger a counter overflow with - * PMC_COUNTER_NEGATIVE_VAL. We don't have an easy way to - * do that since we're counting block of instructions at - * the end of each translation block, and we're probably - * passing this value at this point. - * - * Let's write PMC_COUNTER_NEGATIVE_VAL to the overflowed - * counter to simulate what the real hardware would do. - */ - env->spr[sprn] =3D PMC_COUNTER_NEGATIVE_VAL; } + env->spr[SPR_POWER_PMC5] =3D tmp; } =20 return overflow_triggered; --=20 2.33.1 From nobody Tue May 7 15:54:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641236102892788.5564505938346; Mon, 3 Jan 2022 10:55:02 -0800 (PST) Received: from localhost ([::1]:39558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4SU1-0001Wc-Qs for importer@patchew.org; Mon, 03 Jan 2022 13:55:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4SSu-0007KG-SF; Mon, 03 Jan 2022 13:53:53 -0500 Received: from [2607:f8b0:4864:20::82a] (port=38909 helo=mail-qt1-x82a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4SSt-0006Gw-6U; Mon, 03 Jan 2022 13:53:52 -0500 Received: by mail-qt1-x82a.google.com with SMTP id 8so31334100qtx.5; Mon, 03 Jan 2022 10:53:50 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:f4d8:aa07:335f:99e0:a6e7]) by smtp.gmail.com with ESMTPSA id w9sm29002867qko.71.2022.01.03.10.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 10:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dahHqnMxceDbQ74I84xFv3w02NM0JbWTAXBZEs59W+g=; b=HwygmsqKagS4/1u/wmwDtqnIopi548KVsdvuWfE28cvHuaYGRqk+4a71OKuznCqvED kJ9uYLE00WQoa4gmdmyk2pP7iaiaAqg1DS2/sJlHzspAM2LyLhX17CsuJzVS6Z/a+1+s 4lOS/YRivRuWLS9o+vtH6+sC34aanZtuFC+eRpEOlFoMQHKAqMvZFm6HhIgPJVv5QCiJ Rhi4gt3yMu2Y7tgI8s3Qy5PX5DZEAT1FeDrik4+V8pWWYZCo4Wrsop74FKfv7otXAKBV syku2I7adfL+jIyaDv6cUERXFN3/aqHX7wM2tuFOAq1NxoM+z7DxvBweG2DmQPam5gP0 4qHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dahHqnMxceDbQ74I84xFv3w02NM0JbWTAXBZEs59W+g=; b=mNhOwmeKtgPZcK1XgVNA7EjrGBECdDNn4IhW3ZSvMuofwRhFTJz41CcUvE7q7Otirm pA5xy+B4mX1Rv3g7G+wOpnmVKdJMVVlVZOem0wIYktN5OMnuNfXPztKTqhvcd+BePvyc I/4eNMVaxcQfoTMvhmHrc8Y4158Vmje6J374JXfevdVpRDv/sJt9QW525+k2ZFCBuK0O fguaLQNWHa/KrDzSf8fEZZ91pNh4tTmoOxkb2dpC+EwTn1XSqCZTlpyzTOiMyTuiinWO DzRlDp3DHP5T8TSALwEa7ZiDiO3TBearQo5jeWvn5oxH0bQyZbt+LmFUkfqJYVWNHwyp l8cA== X-Gm-Message-State: AOAM5338e89ycK3a5/7XvtpXFdPgeH0NgnKCGvr4CPT6cXNx+NfTeHVN jeKSBPxSVw6gBpQp9rk7cjUnmuv9RoA= X-Google-Smtp-Source: ABdhPJyQT+KN8QIuV4dShyP6/pCZ7luynKjjCRXd6QtomW+riaKHQJh6noOlA3Dtobxd+qOzkkKAnw== X-Received: by 2002:a05:622a:1114:: with SMTP id e20mr41750945qty.279.1641236030059; Mon, 03 Jan 2022 10:53:50 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v2 3/5] target/ppc: Use env->pnc_cyc_cnt Date: Mon, 3 Jan 2022 15:53:30 -0300 Message-Id: <20220103185332.117878-4-danielhb413@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103185332.117878-1-danielhb413@gmail.com> References: <20220103185332.117878-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::82a (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82a; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x82a.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: richard.henderson@linaro.org, qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641236103690100001 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Use the cached pmc_cyc_cnt value in pmu_update_cycles and pmc_update_overflow_timer. This leaves pmc_get_event and pmc_is_inactive unused, so remove them. Signed-off-by: Richard Henderson --- target/ppc/power8-pmu.c | 107 ++++------------------------------------ 1 file changed, 9 insertions(+), 98 deletions(-) diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 8f01934c15..7fc7d91109 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -24,19 +24,6 @@ =20 #define PMC_COUNTER_NEGATIVE_VAL 0x80000000UL =20 -static bool pmc_is_inactive(CPUPPCState *env, int sprn) -{ - if (env->spr[SPR_POWER_MMCR0] & MMCR0_FC) { - return true; - } - - if (sprn < SPR_POWER_PMC5) { - return env->spr[SPR_POWER_MMCR0] & MMCR0_FC14; - } - - return env->spr[SPR_POWER_MMCR0] & MMCR0_FC56; -} - static bool pmc_has_overflow_enabled(CPUPPCState *env, int sprn) { if (sprn =3D=3D SPR_POWER_PMC1) { @@ -46,80 +33,6 @@ static bool pmc_has_overflow_enabled(CPUPPCState *env, i= nt sprn) return env->spr[SPR_POWER_MMCR0] & MMCR0_PMCjCE; } =20 -/* - * For PMCs 1-4, IBM POWER chips has support for an implementation - * dependent event, 0x1E, that enables cycle counting. The Linux kernel - * makes extensive use of 0x1E, so let's also support it. - * - * Likewise, event 0x2 is an implementation-dependent event that IBM - * POWER chips implement (at least since POWER8) that is equivalent to - * PM_INST_CMPL. Let's support this event on PMCs 1-4 as well. - */ -static PMUEventType pmc_get_event(CPUPPCState *env, int sprn) -{ - uint8_t mmcr1_evt_extr[] =3D { MMCR1_PMC1EVT_EXTR, MMCR1_PMC2EVT_EXTR, - MMCR1_PMC3EVT_EXTR, MMCR1_PMC4EVT_EXTR }; - PMUEventType evt_type =3D PMU_EVENT_INVALID; - uint8_t pmcsel; - int i; - - if (pmc_is_inactive(env, sprn)) { - return PMU_EVENT_INACTIVE; - } - - if (sprn =3D=3D SPR_POWER_PMC5) { - return PMU_EVENT_INSTRUCTIONS; - } - - if (sprn =3D=3D SPR_POWER_PMC6) { - return PMU_EVENT_CYCLES; - } - - i =3D sprn - SPR_POWER_PMC1; - pmcsel =3D extract64(env->spr[SPR_POWER_MMCR1], mmcr1_evt_extr[i], - MMCR1_EVT_SIZE); - - switch (pmcsel) { - case 0x2: - evt_type =3D PMU_EVENT_INSTRUCTIONS; - break; - case 0x1E: - evt_type =3D PMU_EVENT_CYCLES; - break; - case 0xF0: - /* - * PMC1SEL =3D 0xF0 is the architected PowerISA v3.1 - * event that counts cycles using PMC1. - */ - if (sprn =3D=3D SPR_POWER_PMC1) { - evt_type =3D PMU_EVENT_CYCLES; - } - break; - case 0xFA: - /* - * PMC4SEL =3D 0xFA is the "instructions completed - * with run latch set" event. - */ - if (sprn =3D=3D SPR_POWER_PMC4) { - evt_type =3D PMU_EVENT_INSN_RUN_LATCH; - } - break; - case 0xFE: - /* - * PMC1SEL =3D 0xFE is the architected PowerISA v3.1 - * event to sample instructions using PMC1. - */ - if (sprn =3D=3D SPR_POWER_PMC1) { - evt_type =3D PMU_EVENT_INSTRUCTIONS; - } - break; - default: - break; - } - - return evt_type; -} - void pmu_update_summaries(CPUPPCState *env) { target_ulong mmcr0 =3D env->spr[SPR_POWER_MMCR0]; @@ -233,18 +146,16 @@ static void pmu_update_cycles(CPUPPCState *env) { uint64_t now =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); uint64_t time_delta =3D now - env->pmu_base_time; - int sprn; + int sprn, cyc_cnt =3D env->pmc_cyc_cnt; =20 for (sprn =3D SPR_POWER_PMC1; sprn <=3D SPR_POWER_PMC6; sprn++) { - if (pmc_get_event(env, sprn) !=3D PMU_EVENT_CYCLES) { - continue; + if (cyc_cnt & (1 << (sprn - SPR_POWER_PMC1 + 1))) { + /* + * The pseries and powernv clock runs at 1Ghz, meaning + * that 1 nanosec equals 1 cycle. + */ + env->spr[sprn] +=3D time_delta; } - - /* - * The pseries and powernv clock runs at 1Ghz, meaning - * that 1 nanosec equals 1 cycle. - */ - env->spr[sprn] +=3D time_delta; } =20 /* Update base_time for future calculations */ @@ -273,7 +184,7 @@ static void pmc_update_overflow_timer(CPUPPCState *env,= int sprn) return; } =20 - if (pmc_get_event(env, sprn) !=3D PMU_EVENT_CYCLES || + if (!(env->pmc_cyc_cnt & (1 << (sprn - SPR_POWER_PMC1 + 1))) || !pmc_has_overflow_enabled(env, sprn)) { /* Overflow timer is not needed for this counter */ timer_del(pmc_overflow_timer); @@ -281,7 +192,7 @@ static void pmc_update_overflow_timer(CPUPPCState *env,= int sprn) } =20 if (env->spr[sprn] >=3D PMC_COUNTER_NEGATIVE_VAL) { - timeout =3D 0; + timeout =3D 0; } else { timeout =3D PMC_COUNTER_NEGATIVE_VAL - env->spr[sprn]; } --=20 2.33.1 From nobody Tue May 7 15:54:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641236223412775.5204598673885; Mon, 3 Jan 2022 10:57:03 -0800 (PST) Received: from localhost ([::1]:46052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4SVy-0005vZ-41 for importer@patchew.org; Mon, 03 Jan 2022 13:57:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4SSx-0007P3-0i; Mon, 03 Jan 2022 13:53:55 -0500 Received: from [2607:f8b0:4864:20::829] (port=34511 helo=mail-qt1-x829.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4SSv-0006HA-Dp; Mon, 03 Jan 2022 13:53:54 -0500 Received: by mail-qt1-x829.google.com with SMTP id o17so31362652qtk.1; Mon, 03 Jan 2022 10:53:52 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:f4d8:aa07:335f:99e0:a6e7]) by smtp.gmail.com with ESMTPSA id w9sm29002867qko.71.2022.01.03.10.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 10:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nCT71zI72wxQPD4PqNomjBs8jlq7eptbrq0e8moFsqs=; b=XzBSa5xNtDFpj9U6IGOq433G9h7ShA1RQARSbtzmWKg4YjcQgZkiH7AejP157hXFQP geGkf2aj4T+55x88roFT9BgDxGM510Rmd9xTdBiPxkVYktgebord8byWiX8JMoR78e3J MDg0ue+qM7k3z5dAGUQQHomcHOt0BkUPMnFxZVJ4r6mPYjpMMBcJyAXTiR8BOuh4mQL1 VoyA1GZGe8GYf/sFbfbVdeEmtkijTfu9YvtvdQHO5bC+NqTfhHChfZvHPN32UfGqaUGv xKfkqkpANhribCu2t7dabUKNhWrsukpdm+9bv8VFbEhHCmMO64TMvsUgK2bXzBrKxq5s xiFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nCT71zI72wxQPD4PqNomjBs8jlq7eptbrq0e8moFsqs=; b=MrALbKUDmPXb2coxaYOaPKTsZiWA9jK3NzHUQEQyoutctCIiO1zwy4iD6/NogwCuIA JVQPigVpOvmIJCjXrekq7hHAS9N+bG2KOLNou0HZCo30TmRD6aocBBf9Y5OzkPWYN8wQ ae3vA9QpDGX1eAylbbDcfs7CT0ZFNJ/Zt8H5VDEFoDCisw/cHOleirV2jcp7W6RYTlZ/ +6dAO2pdLD/XLJZeOTrB9MEZhCQYFPd1xwqMjk+MkroxEZCot5OlGMFMgad9TMn3YBFF oMd4SoV4cCYElbpXSCQblE+qVBS01Ye4GCFhVEUhtEeH+i4YdB7DMieJj5m9zwSdCHbu GJHw== X-Gm-Message-State: AOAM533rd+j5bVWKgfrfFhLKE0fQBemkftvmn71TZ+02umc0DreLWnSs LuVZgcRnEBEGL2Kr0MPAAAlH9Ohc0NY= X-Google-Smtp-Source: ABdhPJxIiwslfeAisLTSKKG6Dn7htWhTdFCm4ENgvkq3y0fXa/GUwa36wXeli2yYg8oRqlwzWPSf6Q== X-Received: by 2002:ac8:57d1:: with SMTP id w17mr38665498qta.658.1641236032310; Mon, 03 Jan 2022 10:53:52 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v2 4/5] target/ppc: keep ins_cnt/cyc_cnt cleared if MMCR0_FC is set Date: Mon, 3 Jan 2022 15:53:31 -0300 Message-Id: <20220103185332.117878-5-danielhb413@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103185332.117878-1-danielhb413@gmail.com> References: <20220103185332.117878-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::829 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::829; envelope-from=danielhb413@gmail.com; helo=mail-qt1-x829.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: richard.henderson@linaro.org, Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641236224748100001 Content-Type: text/plain; charset="utf-8" pmu_update_summaries() is not considering the case where the PMU can be turned off (i.e. stop counting all events) if MMCR0_FC is set, regardless of the other frozen counter bits state. This use case was covered in the late pmc_get_event(), via the also gone pmc_is_inactive(), that would return an invalid event if MMCR0_FC was set. This use case is exercised by the back_to_back_ebbs_test Linux kernel selftests [1]. As it is today, after enabling EBB exceptions, the test will report an additional event-based branch being taken and will fail. Other tests, such as cycles_test.c, will report additional cycles being calculated in the counters because we're not freezing the PMU quick enough. Fix pmu_update_summaries() by keeping env->ins_cnt and env->cyc_cnt cleared when MMCR0_FC is set. [1] tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c Signed-off-by: Daniel Henrique Barboza --- target/ppc/power8-pmu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 7fc7d91109..73713ca2a3 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -40,6 +40,10 @@ void pmu_update_summaries(CPUPPCState *env) int ins_cnt =3D 0; int cyc_cnt =3D 0; =20 + if (mmcr0 & MMCR0_FC) { + goto hflags_calc; + } + if (!(mmcr0 & MMCR0_FC14) && mmcr1 !=3D 0) { target_ulong sel; =20 @@ -71,6 +75,7 @@ void pmu_update_summaries(CPUPPCState *env) ins_cnt |=3D !(mmcr0 & MMCR0_FC56) << 5; cyc_cnt |=3D !(mmcr0 & MMCR0_FC56) << 6; =20 + hflags_calc: env->pmc_ins_cnt =3D ins_cnt; env->pmc_cyc_cnt =3D cyc_cnt; env->hflags =3D deposit32(env->hflags, HFLAGS_INSN_CNT, 1, ins_cnt != =3D 0); --=20 2.33.1 From nobody Tue May 7 15:54:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1641236225037264.54723852492884; Mon, 3 Jan 2022 10:57:05 -0800 (PST) Received: from localhost ([::1]:46202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4SW0-00061e-2a for importer@patchew.org; Mon, 03 Jan 2022 13:57:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4SSz-0007WW-CE; Mon, 03 Jan 2022 13:53:57 -0500 Received: from [2607:f8b0:4864:20::f35] (port=43732 helo=mail-qv1-xf35.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4SSx-0006HY-Si; Mon, 03 Jan 2022 13:53:57 -0500 Received: by mail-qv1-xf35.google.com with SMTP id fq10so31801524qvb.10; Mon, 03 Jan 2022 10:53:55 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:f4d8:aa07:335f:99e0:a6e7]) by smtp.gmail.com with ESMTPSA id w9sm29002867qko.71.2022.01.03.10.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 10:53:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V3YTg3Mut9jhi/NXD0xJNr/90t1QA5jizZEVU//o/q4=; b=ejxFk90e00DOtcUcy4eJqGOULioc89fBxifgcmxi2LqcOjF7XfG4RUa6Vt3hA30V95 /gdlWM6yDpH3dduuydtVCMoRHMoqZQW1wOCbbKuGKsbYDMkbUf1oQeyuEj0LbOFrzd1Z iY0c1C/AlvBga1tJZPwdKbSdQ/01YuFTJOxQfy6NLkdnpVXF5ivhVQ9KUej3+xy8og1h rl/6deZsRlbKhq9gltXcu5uK4RoVWy+EaJnD/RqBGxwqvILNrZvREaGZ0OXqvfo3d3uS Ba0TwJOcBQAFkBlgRltWgSZeVtBrk/Ad4i6y1ko01yR1o6UhiZzxtEWsLUlrtkxH1NHf jhSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V3YTg3Mut9jhi/NXD0xJNr/90t1QA5jizZEVU//o/q4=; b=qxMMqYdQMRR6v3GQCiokd0i57u5y4oxRkkrJJvOevzuSdU+ANptfEA8rAz1vPIAud9 9JXmTFiFuaJFHmrx2NywEwnbp2JJ6k07osklFNNNu7hT5++DX+G7G+PAcw0af+RlErN0 wNCnvmjpM4c7DYWgRzRWURpES+h4lWjqV82CceQ+cil033zoAbAw/lt/ziSITBuosjCF E82ZHYM7qZqHMmGOCZG9Uw83tPrJo3URLUguR6egscX7DsKbJVv+3JiV3wdTXi27mPpH yVUzj+Wa/uJVQSCCCCiox4VSU0N7L8Sq59VxzMzR/tP30XK2pgaHNAnsSn7fGqSJ6/in CUTg== X-Gm-Message-State: AOAM531xVI/cL+xGCtUhfvgfvH53Q9AoPEUTl7zmaAu1Eq5u3EfFsYjc HE8YdZ0CmYz8s2uTlXCCkaqa2Tp0mjM= X-Google-Smtp-Source: ABdhPJyzCZ6gSaj+KXPjAh2TreHqVLE6khWrmX8HQSgZomMEIR1JeHH8gqnoJwYX87+c2ECSbDIxHQ== X-Received: by 2002:a05:6214:c82:: with SMTP id r2mr12350244qvr.51.1641236034631; Mon, 03 Jan 2022 10:53:54 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v2 5/5] target/ppc: do not call hreg_compute_hflags() in helper_store_mmcr0() Date: Mon, 3 Jan 2022 15:53:32 -0300 Message-Id: <20220103185332.117878-6-danielhb413@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220103185332.117878-1-danielhb413@gmail.com> References: <20220103185332.117878-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f35 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f35; envelope-from=danielhb413@gmail.com; helo=mail-qv1-xf35.google.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: richard.henderson@linaro.org, Daniel Henrique Barboza , qemu-ppc@nongnu.org, clg@kaod.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1641236227107100001 Content-Type: text/plain; charset="utf-8" MMCR0 writes will change only MMCR0 bits which are used to calculate HFLAGS_PMCC0, HFLAGS_PMCC1 and HFLAGS_INSN_CNT hflags. No other machine register will be changed during this operation. This means that hreg_compute_hflags() is overkill for what we need to do. pmu_update_summaries() is already updating HFLAGS_INSN_CNT without calling hreg_compure_hflags(). Let's do the same for the other 2 MMCR0 hflags. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Richard Henderson --- target/ppc/power8-pmu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/target/ppc/power8-pmu.c b/target/ppc/power8-pmu.c index 73713ca2a3..69342413bd 100644 --- a/target/ppc/power8-pmu.c +++ b/target/ppc/power8-pmu.c @@ -224,12 +224,17 @@ static void pmu_update_overflow_timers(CPUPPCState *e= nv) =20 void helper_store_mmcr0(CPUPPCState *env, target_ulong value) { + uint32_t hflags_pmcc0 =3D (value & MMCR0_PMCC0) !=3D 0; + uint32_t hflags_pmcc1 =3D (value & MMCR0_PMCC1) !=3D 0; + pmu_update_cycles(env); =20 env->spr[SPR_POWER_MMCR0] =3D value; =20 /* MMCR0 writes can change HFLAGS_PMCC[01] and HFLAGS_INSN_CNT */ - hreg_compute_hflags(env); + env->hflags =3D deposit32(env->hflags, HFLAGS_PMCC0, 1, hflags_pmcc0); + env->hflags =3D deposit32(env->hflags, HFLAGS_PMCC1, 1, hflags_pmcc1); + pmu_update_summaries(env); =20 /* Update cycle overflow timers with the current MMCR0 state */ --=20 2.33.1