From nobody Tue Feb 10 11:13:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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 ARC-Seal: i=1; a=rsa-sha256; t=1659483406; cv=none; d=zohomail.com; s=zohoarc; b=KBLZuoAuiM8G/gnJ0XyiafehMjSOjo+Df2yi//6NoxSr8rR3dvln6dNQXEs6kNSG3ysWx7YR7INZZVZ7QQLpBJXC0bb6VHufsVERePozt56/tMEB0CoUvoSW8LYIBdGFtCk2BUq+QSef7ECYz8KjtC93EY19ABrkMI2Ch2lI1kE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659483406; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AawLEnbCgyWfCwE76nQNcO9C0q8m7N0XCwcd0R4VRtk=; b=JKKfnJYtTDl1zYwoesORLb2L5gH3bDzOZYFEiiWKoImbTiOJkp9rdoXecjUf90lFX/Z6jR/UvlmEiCQDvV/4HrYj/ybOUmlJC6DwhoH1y7IyA3cMhF+fxrNfXgC2fivayRkcuRuXDl1U0vnGoi0kX11NkqfYnxKFZ0poNHDLZiE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659483406219149.98474540110817; Tue, 2 Aug 2022 16:36:46 -0700 (PDT) Received: from localhost ([::1]:47280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJ1RN-0006rG-56 for importer@patchew.org; Tue, 02 Aug 2022 19:36:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJ1O4-0003CR-2D for qemu-devel@nongnu.org; Tue, 02 Aug 2022 19:33:20 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:34784) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJ1O2-0007lc-1W for qemu-devel@nongnu.org; Tue, 02 Aug 2022 19:33:19 -0400 Received: by mail-pl1-x631.google.com with SMTP id z19so14855166plb.1 for ; Tue, 02 Aug 2022 16:33:17 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id s10-20020a170902a50a00b001636d95fe59sm250543plq.172.2022.08.02.16.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Aug 2022 16:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=AawLEnbCgyWfCwE76nQNcO9C0q8m7N0XCwcd0R4VRtk=; b=0cRWwQrbGz0sOB9KK0zdE6NX+kumXJsp6W4cIOHfG7uTTpzwfAIDJ2nWnXlTxmdnFT GHO4GWCGkHE/RQFl24FCgfaeFm/Tcp5UwG15c1eIyeGcdJz2IJvymh2Vu4BXzNzXLX8i FcOlp8bdF0XXLXuAaV9S51iRhUn1M6WYEyKG/u3E4bN6h7cQjsWtAlr19X7ifJ1cEEMV RrmOyoheBg0N51RAbbgv+0/LQYBuT+wM23gAmyGb1uN4fOIOoxpbUTlirW8Ml3jrwfHc FZEJqpyw06yI7eMaziQVa3LptXEg190lGRREL/n/qsf+CD6p3BEPE2hgf6hHrUBcWNZH qBrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=AawLEnbCgyWfCwE76nQNcO9C0q8m7N0XCwcd0R4VRtk=; b=zp6Y5mKG0uccaK8B5lSGxUQJgWXs8qwq/F7WGxqBQemYcy7FpdTon0+BBkzbBhitXX kfKmQgViNNNMNFzJkHhBVsAVZeVNaGer66WQ4uBt2U39XaqlkLQP+PV8io84XgkzZBB8 FRFDWkTV+g5czZfxmFX+/AFx3WtNq+xgvNfQcbyjYxrzM3i5SS6dUHzJXG0w68L8T5Ic SSzOkTK9yi7ly5+h8AmYN+GuvVZ8BpYG75Y0gytqL3OaufhrYkQbSIjPgww2dvQw0FRv XOiIeCf4KN+e+A5/xHRrpEP3xpgu91+STJu91eTUkjGplfX874KH7bZywTD0rvvMyCww uvQQ== X-Gm-Message-State: ACgBeo2/nuHfOUET/W+4Qtaffy9hZoRKR2owlfGced5lfmQSSk5Z9OAN bG3jxhfUYksBEn29aDCLkzr46VulHUiogQ== X-Google-Smtp-Source: AA6agR7gaftFUXfOaogcB2UTrVG4VA/fiFSbGaHveSdNyGk+Zfk1XF6jZjfjm2lUSjDfIqOkfy9TCw== X-Received: by 2002:a17:903:1c1:b0:16f:939:7d3 with SMTP id e1-20020a17090301c100b0016f093907d3mr3958023plh.77.1659483196376; Tue, 02 Aug 2022 16:33:16 -0700 (PDT) From: Atish Patra To: qemu-devel@nongnu.org Cc: Bin Meng , Alistair Francis , Atish Patra , Bin Meng , Palmer Dabbelt , qemu-riscv@nongnu.org Subject: [PATCH v12 2/6] target/riscv: Simplify counter predicate function Date: Tue, 2 Aug 2022 16:33:03 -0700 Message-Id: <20220802233307.2106839-3-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220802233307.2106839-1-atishp@rivosinc.com> References: <20220802233307.2106839-1-atishp@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::631; envelope-from=atishp@rivosinc.com; helo=mail-pl1-x631.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @rivosinc-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1659483407372100001 Content-Type: text/plain; charset="utf-8" All the hpmcounters and the fixed counters (CY, IR, TM) can be represented as a unified counter. Thus, the predicate function doesn't need handle each case separately. Simplify the predicate function so that we just handle things differently between RV32/RV64 and S/HS mode. Reviewed-by: Bin Meng Acked-by: Alistair Francis Signed-off-by: Atish Patra --- target/riscv/csr.c | 110 ++++----------------------------------------- 1 file changed, 9 insertions(+), 101 deletions(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 9b45c49ab45f..6690b72ea0e7 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -74,6 +74,7 @@ static RISCVException ctr(CPURISCVState *env, int csrno) CPUState *cs =3D env_cpu(env); RISCVCPU *cpu =3D RISCV_CPU(cs); int ctr_index; + target_ulong ctr_mask; int base_csrno =3D CSR_CYCLE; bool rv32 =3D riscv_cpu_mxl(env) =3D=3D MXL_RV32 ? true : false; =20 @@ -82,122 +83,29 @@ static RISCVException ctr(CPURISCVState *env, int csrn= o) base_csrno +=3D 0x80; } ctr_index =3D csrno - base_csrno; + ctr_mask =3D BIT(ctr_index); =20 if ((csrno >=3D CSR_CYCLE && csrno <=3D CSR_INSTRET) || (csrno >=3D CSR_CYCLEH && csrno <=3D CSR_INSTRETH)) { goto skip_ext_pmu_check; } =20 - if ((!cpu->cfg.pmu_num || !(cpu->pmu_avail_ctrs & BIT(ctr_index)))) { + if (!(cpu->pmu_avail_ctrs & ctr_mask)) { /* No counter is enabled in PMU or the counter is out of range */ return RISCV_EXCP_ILLEGAL_INST; } =20 skip_ext_pmu_check: =20 - if (env->priv =3D=3D PRV_S) { - switch (csrno) { - case CSR_CYCLE: - if (!get_field(env->mcounteren, COUNTEREN_CY)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - case CSR_TIME: - if (!get_field(env->mcounteren, COUNTEREN_TM)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - case CSR_INSTRET: - if (!get_field(env->mcounteren, COUNTEREN_IR)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: - if (!get_field(env->mcounteren, 1 << ctr_index)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - } - if (rv32) { - switch (csrno) { - case CSR_CYCLEH: - if (!get_field(env->mcounteren, COUNTEREN_CY)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - case CSR_TIMEH: - if (!get_field(env->mcounteren, COUNTEREN_TM)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - case CSR_INSTRETH: - if (!get_field(env->mcounteren, COUNTEREN_IR)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: - if (!get_field(env->mcounteren, 1 << ctr_index)) { - return RISCV_EXCP_ILLEGAL_INST; - } - break; - } - } + if (((env->priv =3D=3D PRV_S) && (!get_field(env->mcounteren, ctr_mask= ))) || + ((env->priv =3D=3D PRV_U) && (!get_field(env->scounteren, ctr_mask)= ))) { + return RISCV_EXCP_ILLEGAL_INST; } =20 if (riscv_cpu_virt_enabled(env)) { - switch (csrno) { - case CSR_CYCLE: - if (!get_field(env->hcounteren, COUNTEREN_CY) && - get_field(env->mcounteren, COUNTEREN_CY)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - case CSR_TIME: - if (!get_field(env->hcounteren, COUNTEREN_TM) && - get_field(env->mcounteren, COUNTEREN_TM)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - case CSR_INSTRET: - if (!get_field(env->hcounteren, COUNTEREN_IR) && - get_field(env->mcounteren, COUNTEREN_IR)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - case CSR_HPMCOUNTER3...CSR_HPMCOUNTER31: - if (!get_field(env->hcounteren, 1 << ctr_index) && - get_field(env->mcounteren, 1 << ctr_index)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - } - if (rv32) { - switch (csrno) { - case CSR_CYCLEH: - if (!get_field(env->hcounteren, COUNTEREN_CY) && - get_field(env->mcounteren, COUNTEREN_CY)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - case CSR_TIMEH: - if (!get_field(env->hcounteren, COUNTEREN_TM) && - get_field(env->mcounteren, COUNTEREN_TM)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - case CSR_INSTRETH: - if (!get_field(env->hcounteren, COUNTEREN_IR) && - get_field(env->mcounteren, COUNTEREN_IR)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - case CSR_HPMCOUNTER3H...CSR_HPMCOUNTER31H: - if (!get_field(env->hcounteren, 1 << ctr_index) && - get_field(env->mcounteren, 1 << ctr_index)) { - return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; - } - break; - } + if (!get_field(env->hcounteren, ctr_mask) && + get_field(env->mcounteren, ctr_mask)) { + return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; } } #endif --=20 2.25.1