From patchwork Sat Mar 1 05:28:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 13997359 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ABCEEC021B8 for ; Sat, 1 Mar 2025 05:35:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1toFQ2-0002i6-CO; Sat, 01 Mar 2025 00:29:46 -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 1toFPp-0001OI-61 for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:29:33 -0500 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1toFPl-0008Su-Tp for qemu-devel@nongnu.org; Sat, 01 Mar 2025 00:29:32 -0500 Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5213MF8b026309 for ; Sat, 1 Mar 2025 05:29:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= pU8hVZPrx5M/Nh+U274cUvZDIgmflPFv/nrq9791pcA=; b=MQIkd37EHT4LSHVL uBUALii/gF8gTz4qV9blqg+Qr4ipowOwSrBXv/UkV5mO5BlNexw9FJaHR/GjB/HO BSVuzgojcHJsXTRjsgfN237BLow79zAxemggnRPTzGd1MA/rI0T18U+mtiJSFtVR NpvLscgM1xdIX/B/1bhhXP0ASDyAx5bFzwrDWoJg6VOz0JohQwo+2+QnYLmdn7L8 C+0cFAoBmx1yz0PM32zsuvRlYQVDrVD5of/h7dqTVTkb1rp5s9sQk5STKp3YwlXy 0HjIHsxl4T7qZ9Xr9tKvudF3nE4tJe3+pThtaOPGmCuu6Gt6VytX+aBYxRCxvhHo tG3J8g== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 453t95r67y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 01 Mar 2025 05:29:28 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-2fede63f32dso536184a91.1 for ; Fri, 28 Feb 2025 21:29:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740806967; x=1741411767; 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=pU8hVZPrx5M/Nh+U274cUvZDIgmflPFv/nrq9791pcA=; b=nI3OqZ/ojmjfaGHiAou6z6ksbH56rgsac92gJ3ktV8s8aybSqjPLMnTW8X7lc1yvm3 hbTjGhbmPSAGFQ6H/Flchc4KdLXEN7UQ3wQSi0/ZgEDDzFXlZbXEweeV5RgpKLtfFAL1 Vj7qW0oKDt9DS8R1rL3gcY/M88nfk/IiVCZcbwkYQX7A13WXpERSQm+qHA/VAwoMbDvt lOdrPvp30FIx/Ou3Cxgo5D32YU3T3hXecyBjN0wNChCIPkR8i1hwshV9+/PCsUq6jAc9 KCLP9zT90DDXliFKQZH9cIMc0HkoeuCW8tteiU22uzfGemruKvsPN57yNlmgQuLH8XYG ZNLw== X-Gm-Message-State: AOJu0YwqF7k7Ef4yyKYGjVFb/Pz3GfdM172P8I4TiBKw9oBT05IqovWq 8bXT5mTlaCUeLRR/0DPHVi8M4gGlNqD5+Oa070qAKU1YzEU/R2F/vYKF+ywezPdPTcMwmPFWHYs 3AmxN/Ckxc6wYNZNgKI8NEM/MeizS05A6Mwj2UwRdERpLeicBCoA1CyBSs6Zjvw== X-Gm-Gg: ASbGncu2szgQa9ddF/cLR1BRi4mKdt20cPOMVAjb/bXew7ySkqwq8CFlWdcL8gSYxIj pvyh7CFIOEZB455eql8GfhWyv+KbTRHzrWcWvj5AgyLieHOObbFDOhI5wfM6If50NCKA3QDOT64 RdxUT6TcYfJQWfYDatJdR0UOeHg4+0Y3v1zZSIFeE6I841sXCoohX605SpWMpNFQm3K3dBas4ag iYp2z6fT6XRknYPo69hL+NXYy+HtEpby5qT4poq9FZ65lDDJHreU/ApT5OZKWW9H9VHExKReLyq d+ek5ppW1fNAql52kO5uVzKV/vywC3fhQ2Uv6pvj+9zFVR/h+7JVEBv62DLwNCDh X-Received: by 2002:a17:90b:2252:b0:2fa:ba3:5457 with SMTP id 98e67ed59e1d1-2febab78780mr11231842a91.17.1740806967497; Fri, 28 Feb 2025 21:29:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9EEBosxkYmLIuU0Y8M9gRyBFgVwCeMoJWW3S2wxEhbFbX6iL2nNeqLVr0BoqRXbA1sFOLKg== X-Received: by 2002:a17:90b:2252:b0:2fa:ba3:5457 with SMTP id 98e67ed59e1d1-2febab78780mr11231808a91.17.1740806967131; Fri, 28 Feb 2025 21:29:27 -0800 (PST) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2fea67a5dc8sm4732955a91.23.2025.02.28.21.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2025 21:29:26 -0800 (PST) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, quic_mathbern@quicinc.com, ale@rev.ng, anjo@rev.ng, quic_mliebel@quicinc.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com, Brian Cain Subject: [PATCH 29/39] target/hexagon: Add pkt_ends_tb to translation Date: Fri, 28 Feb 2025 21:28:35 -0800 Message-Id: <20250301052845.1012069-30-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250301052845.1012069-1-brian.cain@oss.qualcomm.com> References: <20250301052845.1012069-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 5N0q0_NwYPT_i96D2jXU9E8sfJx8nrLu X-Proofpoint-GUID: 5N0q0_NwYPT_i96D2jXU9E8sfJx8nrLu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-01_01,2025-02-28_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 phishscore=0 mlxlogscore=731 clxscore=1015 priorityscore=1501 lowpriorityscore=0 spamscore=0 malwarescore=0 suspectscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502100000 definitions=main-2503010040 Received-SPF: pass client-ip=205.220.180.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Brian Cain Signed-off-by: Brian Cain --- target/hexagon/translate.h | 1 + target/hexagon/translate.c | 99 +++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/target/hexagon/translate.h b/target/hexagon/translate.h index 9bc4b3ce8b..c9533fee1f 100644 --- a/target/hexagon/translate.h +++ b/target/hexagon/translate.h @@ -84,6 +84,7 @@ typedef struct DisasContext { TCGv branch_taken; TCGv dczero_addr; bool pcycle_enabled; + bool pkt_ends_tb; uint32_t num_cycles; } DisasContext; diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 060df6e5eb..475726388a 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -259,6 +259,18 @@ static bool check_for_attrib(Packet *pkt, int attrib) return false; } +#ifndef CONFIG_USER_ONLY +static bool check_for_opcode(Packet *pkt, uint16_t opcode) +{ + for (int i = 0; i < pkt->num_insns; i++) { + if (pkt->insn[i].opcode == opcode) { + return true; + } + } + return false; +} +#endif + static bool need_slot_cancelled(Packet *pkt) { /* We only need slot_cancelled for conditional store instructions */ @@ -272,6 +284,90 @@ static bool need_slot_cancelled(Packet *pkt) return false; } +#ifndef CONFIG_USER_ONLY +static bool sreg_write_to_global(int reg_num) +{ + return reg_num == HEX_SREG_SSR || + reg_num == HEX_SREG_STID || + reg_num == HEX_SREG_IMASK || + reg_num == HEX_SREG_IPENDAD || + reg_num == HEX_SREG_BESTWAIT || + reg_num == HEX_SREG_SCHEDCFG; +} + +static bool has_sreg_write_to_global(Packet const *pkt) +{ + for (int i = 0; i < pkt->num_insns; i++) { + Insn const *insn = &pkt->insn[i]; + uint16_t opcode = insn->opcode; + if (opcode == Y2_tfrsrcr) { + /* Write to a single sreg */ + int reg_num = insn->regno[0]; + if (sreg_write_to_global(reg_num)) { + return true; + } + } else if (opcode == Y4_tfrspcp) { + /* Write to a sreg pair */ + int reg_num = insn->regno[0]; + if (sreg_write_to_global(reg_num)) { + return true; + } + if (sreg_write_to_global(reg_num + 1)) { + return true; + } + } + } + return false; +} +#endif + +static bool pkt_ends_tb(Packet *pkt) +{ + if (pkt->pkt_has_cof) { + return true; + } +#ifndef CONFIG_USER_ONLY + /* System mode instructions that end TLB */ + if (check_for_opcode(pkt, Y2_swi) || + check_for_opcode(pkt, Y2_cswi) || + check_for_opcode(pkt, Y2_ciad) || + check_for_opcode(pkt, Y4_siad) || + check_for_opcode(pkt, Y2_wait) || + check_for_opcode(pkt, Y2_resume) || + check_for_opcode(pkt, Y2_iassignw) || + check_for_opcode(pkt, Y2_setimask) || + check_for_opcode(pkt, Y4_nmi) || + check_for_opcode(pkt, Y2_setprio) || + check_for_opcode(pkt, Y2_start) || + check_for_opcode(pkt, Y2_stop) || + check_for_opcode(pkt, Y2_k0lock) || + check_for_opcode(pkt, Y2_k0unlock) || + check_for_opcode(pkt, Y2_tlblock) || + check_for_opcode(pkt, Y2_tlbunlock) || + check_for_opcode(pkt, Y2_break) || + check_for_opcode(pkt, Y2_isync) || + check_for_opcode(pkt, Y2_syncht) || + check_for_opcode(pkt, Y2_tlbp) || + check_for_opcode(pkt, Y2_tlbw) || + check_for_opcode(pkt, Y5_ctlbw) || + check_for_opcode(pkt, Y5_tlbasidi)) { + return true; + } + + /* + * Check for sreg writes that would end the TB + */ + if (check_for_attrib(pkt, A_IMPLICIT_WRITES_SSR)) { + return true; + } + if (has_sreg_write_to_global(pkt)) { + return true; + } +#endif + return false; +} + + static bool need_next_PC(DisasContext *ctx) { Packet *pkt = ctx->pkt; @@ -473,6 +569,7 @@ static void gen_start_packet(DisasContext *ctx) tcg_gen_movi_tl(hex_slot_cancelled, 0); } ctx->branch_taken = NULL; + ctx->pkt_ends_tb = pkt_ends_tb(pkt); if (pkt->pkt_has_cof) { ctx->branch_taken = tcg_temp_new(); if (pkt->pkt_has_multi_cof) { @@ -927,7 +1024,7 @@ static void gen_commit_packet(DisasContext *ctx) pkt->vhist_insn->generate(ctx); } - if (pkt->pkt_has_cof) { + if (ctx->pkt_ends_tb || ctx->base.is_jmp == DISAS_NORETURN) { gen_end_tb(ctx); } }