From patchwork Mon Apr 7 19:27:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041648 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 410EAC36010 for ; Mon, 7 Apr 2025 19:28:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1s8A-0001k9-PL; Mon, 07 Apr 2025 15:27:39 -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 1u1s7q-0001gU-KC for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:26 -0400 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 1u1s7p-0002k2-3D for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:18 -0400 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 537ITSLc017471 for ; Mon, 7 Apr 2025 19:27:15 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= UXS2kKh202fdZ0f/nl2ZPKDjzS86kYapgLyIhkg2tmc=; b=T44IRUXTy9uY3PF7 tvQO9RiaszJnYC8Iy9bCVSfDwxRims66aa8kH4AAWtgeF3aOVhgb/z2k0B5qCcp5 zjRNdc4DTDNzkAik2bB78utG5qRBv6GbJP6JGkiV3T5yS/HLgFIZldjZp9GtQQPn AGkduYvuKoY8gfDemuUO7jz/FXv60Zi/PO6TCmSo493Wv59V6G0ZFsbv4cOdnUSx YdT8NRGHtLy7A76H/dnFd4gWaNaQ64Hsivec2/8QjufilLnRK203ZTjFgz+IHggV NT1wsiUYpenJdCvy4mpyQCENm4ZsTGdsQ3sTGe/ZzQx1zASguYjry+5W23bXMpIx DV9YXA== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twg3d9w6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 19:27:15 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2264e5b2b7cso39511885ad.2 for ; Mon, 07 Apr 2025 12:27:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744054033; x=1744658833; 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=UXS2kKh202fdZ0f/nl2ZPKDjzS86kYapgLyIhkg2tmc=; b=A1sqF71NH73LMHcoK1lfQ1yD+LueTbMPYUcGWBMGJgPAx4o3NBcDc1N3yZkgkGlfA8 xGfOSjn86K7/QT69Hp2ZavKrjNBgbzwpEWx7Xp9qb6SVqtl24UeuwfDvk4P5SrUkpErk uzZBrNgx57Jl1u2fNm1R6zqzPvCDJ2LGw0sNsN53SuH98Bnb+QJzn/brCXWP4l9RbWLr ZxU0gCirZXDEp7nOnWn4Lo06epxLsPJ56zNPdoQkCGxq2iPy1RnT7EvyBtupA07xNSDY KGBvZIWyD3HINSa3MtYGyQyTl+NDu0rTQZSA46utiQKtDjKrFLhhzn/KKKDzHA6ZHRN7 JzRQ== X-Gm-Message-State: AOJu0YyWJylOA5/A4TcB1Y4dkhVcXajpp8vPAnUa3bm0x68se1M4E1rR WW1XLCX4DLdGA46vV2YxCMxSPMxV01Ahly7nILcJZ58Hgs4gloUkZMk0uTQNWk1Zd1Biw/U9nEx HoMoOeWUxJ8v/TdxPW8uuTJ9PIpNcnCrS1mDN93UPATCtbv3VLQabSvfxoF9Zyg== X-Gm-Gg: ASbGncuWUotnS+wSLOkPIFW8hHBAQWpA2F1Z2ouerM4NkT9TJgF+CQCCySSpSIOh1gc J/QX/cIMNaxCrdzyHeCmqqme6bu1hLzCV4QQ3LMJ4/DZuQ39Af+hOO6XwwFD93j9GE0qIUnvJDc ej3pJPLKVud1UT2n6aCRLrPGVqTQALNZ0qAKNXQvS/xz45aH+yGKaC+MLq/buZwYQ3qhHyKUJuX JdFmdVs8pTCRJs7VbXn6TVC4YwzYGRZuW2lfNzhX52dvJ9jWpdXKPyVDGq+r7oQWKhDvUKw/hBX 9D4bemZc5/O2XmUotsBBv1rcVtZfB3KKRNjgWT70nfpiEDFG9k6MZZP+HN6KmwTw X-Received: by 2002:a17:902:d4c9:b0:223:432b:593d with SMTP id d9443c01a7336-22a8a8e3c86mr175491415ad.42.1744054033013; Mon, 07 Apr 2025 12:27:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGni8P96NHOk/y1JWk6+W81IAXjBlgU3vE+7iLHKu2/OEdworF4FsSpVP9ZkOzCUbsASmDGZw== X-Received: by 2002:a17:902:d4c9:b0:223:432b:593d with SMTP id d9443c01a7336-22a8a8e3c86mr175491215ad.42.1744054032680; Mon, 07 Apr 2025 12:27:12 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee619sm9206559b3a.52.2025.04.07.12.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 12:27:12 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com Subject: [PATCH v3 1/5] target/hexagon: handle .new values Date: Mon, 7 Apr 2025 12:27:01 -0700 Message-Id: <20250407192705.2605614-2-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> References: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: N3ozXeg9rCbOURDSDNhXkC3aI0gV_0nT X-Proofpoint-ORIG-GUID: N3ozXeg9rCbOURDSDNhXkC3aI0gV_0nT X-Authority-Analysis: v=2.4 cv=I/9lRMgg c=1 sm=1 tr=0 ts=67f42713 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=G8g7tdY8SUdx2gpfVe8A:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_05,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 phishscore=0 suspectscore=0 mlxlogscore=393 lowpriorityscore=0 spamscore=0 clxscore=1015 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070136 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 Signed-off-by: Brian Cain Reviewed-by: Taylor Simpson --- target/hexagon/hex_common.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index 758e5fd12d..6803908718 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -350,6 +350,7 @@ def helper_arg(self): f"{self.helper_arg_type()} {self.helper_arg_name()}" ) + # # Every register is either Single or Pair or Hvx # @@ -1070,11 +1071,22 @@ def init_registers(): for reg in new_regs: new_registers[f"{reg.regtype}{reg.regid}"] = reg -def get_register(tag, regtype, regid): - if f"{regtype}{regid}V" in semdict[tag]: - return registers[f"{regtype}{regid}"] - else: - return new_registers[f"{regtype}{regid}"] +def is_new_reg(tag, regid): + if regid[0] in "NO": + return True + return regid[0] == "P" and \ + f"{regid}N" in semdict[tag] and \ + f"{regid}V" not in semdict[tag] + +def get_register(tag, regtype, regid, subtype=""): + regid = f"{regtype}{regid}" + is_new = is_new_reg(tag, regid) + try: + reg = new_registers[regid] if is_new else registers[regid] + except KeyError: + raise Exception(f"Unknown {'new ' if is_new else ''}register {regid}" +\ + f"from '{tag}' with syntax '{semdict[tag]}'") from None + return reg def helper_ret_type(tag, regs): ## If there is a scalar result, it is the return type From patchwork Mon Apr 7 19:27:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041652 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 1E6ABC36018 for ; Mon, 7 Apr 2025 19:29:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1s9Q-0002Q0-Vc; Mon, 07 Apr 2025 15:28:57 -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 1u1s7q-0001gW-UP for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:26 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1s7p-0002k5-Dq for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:18 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 537IWWll003197 for ; Mon, 7 Apr 2025 19:27:16 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= EiQbG6U0f9LHetgnzek7cEGoKXSJehnEfH9Sv/+XjQc=; b=AMSMyOLku/cP2X2E irLFliN9oXlHn5z5cz3o2tGQ8FfO9QSApF31wbGFD9bRePiFHp61eldfxn+jQYKX L/KObS0eSuc/5r0DXgP8wumOISpGoUuEVFdpPbmxZna8MqI7JkpqRZ3yGbbM+KSa 3C6BBrF3emWlhP0KYzI5oi/75yQxX4H/S/31QhzBQixCCDg0auzusPyi8C6Ipl0l lh6bHFEsv808TV0zfA4PtZ9VKO7p+GXryF5e6uZ40xweSCRxBRRrSIMGzUcelmAo NJlWNoLv4Vm1GLAD4NIRJGbnXzk3y0FbrFPhd1wiwEuXKWpbJbqOVYI0j4D5Wjlb cUSQVg== Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twftd9ay-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 19:27:16 +0000 (GMT) Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-736c1ea954fso2479303b3a.3 for ; Mon, 07 Apr 2025 12:27:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744054035; x=1744658835; 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=EiQbG6U0f9LHetgnzek7cEGoKXSJehnEfH9Sv/+XjQc=; b=U5HsoskgzD4ZPM7g58SQudReYvywLjlg45U3U6yTo5uiz6NAic0LeYnQrU816nviyx oe6m2Bd5bGapKdBRH77ktq5VAG39IfGJuCYOIbid+rqO7lkbpOZ09XVcMT4iVdejoXIu cRXOcV9GdmpfzpTpRWjwIs5JhdAhUfdSxiy4vyJ0BB/vqZ/TE5Y1lNJtwdFVjMRU7GcQ LDatqK8Wk11rqyRanPV36etaYlWk4HQGlnG3qmNiUzEIXaaTX0Nu90rQawmJAffbb9rI RFAm1BcuK+jJAfjsNBpRbnjHKm912M3Dn2vALmyT5Vd51iyDGQaGF2UIG4zxD+oFEHWk RSFA== X-Gm-Message-State: AOJu0YyfmRKOK1utt7V1YTjjf0wUEtF4knN3UP4+ApgPc9qLcP4imN/c bGlyw0OQu35U5CgC9VvL99RK4okjQUVddGX1TDJx3aFy5tN9Tlu3TRe+Vr/eqiQbSCQTZMS5U6G qEs3pZMsDaeF+gX2fxN0DAEu/GF2Vha4qwp2/ZwSxbXtNxI7kh1U+zsHep4AeUA== X-Gm-Gg: ASbGncs4j1gRGsEVMJzmSWqxtnBFNh0ZRUfauls7236nPZsXOHY1dHJSM/kjskiWY+W auDKvzt9vfDEQWDowEWICpQ1kKnwY8zfhWWF7QMfJzqZYxtKreKR/dvXRiBwooisIjUgTAbT/KC 4KVy8vOMupjAGqSC6rCdk6U2K2ym0ioH0+iBQuZyFNqBwKcUIpJFmCilap838xvNPZ69YLeTWYv OIzYaD8LV1P+MtYv2tJuv0CvKQoVXWKRXEKPaDR25TCh88kUPAHWJ9PMNK3n3P2o7PbPpQ/dwQP kputvg+LcWvj0pdEe8KG9hos8plkPugS+NBA82WzOqthHcSpGzire5aMwioL1bLu X-Received: by 2002:a05:6a21:6f8b:b0:1ee:c8e7:203c with SMTP id adf61e73a8af0-2010462b41bmr20268467637.24.1744054035018; Mon, 07 Apr 2025 12:27:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIGhndqzz+tHyBE4738BQOag9UpQQ12nP6wp7LGR6zXt1LwL7C65Lvuj3hcmZSbMuFQFMdug== X-Received: by 2002:a05:6a21:6f8b:b0:1ee:c8e7:203c with SMTP id adf61e73a8af0-2010462b41bmr20268434637.24.1744054034719; Mon, 07 Apr 2025 12:27:14 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee619sm9206559b3a.52.2025.04.07.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 12:27:13 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com Subject: [PATCH v3 2/5] target/hexagon: Fix badva reference, delete CAUSE Date: Mon, 7 Apr 2025 12:27:02 -0700 Message-Id: <20250407192705.2605614-3-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> References: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=B5+50PtM c=1 sm=1 tr=0 ts=67f42714 cx=c_pps a=m5Vt/hrsBiPMCU0y4gIsQw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=HN0uuiy-se_EESAQhN8A:9 a=QEXdDO2ut3YA:10 a=IoOABgeZipijB_acs4fv:22 X-Proofpoint-GUID: mc3qeX8jepC0BkLqKC21DAOEW3vagBkj X-Proofpoint-ORIG-GUID: mc3qeX8jepC0BkLqKC21DAOEW3vagBkj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_05,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=905 suspectscore=0 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0 priorityscore=1501 adultscore=0 impostorscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070136 Received-SPF: pass client-ip=205.220.168.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 The BADVA reg is referred to with the wrong identifier. The CAUSE reg field of SSR is not yet modeled. Signed-off-by: Brian Cain --- target/hexagon/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 766b678651..62f1fe15b8 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -216,8 +216,7 @@ static void hexagon_dump(CPUHexagonState *env, FILE *f, int flags) qemu_fprintf(f, " cs0 = 0x00000000\n"); qemu_fprintf(f, " cs1 = 0x00000000\n"); #else - print_reg(f, env, HEX_REG_CAUSE); - print_reg(f, env, HEX_REG_BADVA); + print_reg(f, env, HEX_SREG_BADVA); print_reg(f, env, HEX_REG_CS0); print_reg(f, env, HEX_REG_CS1); #endif From patchwork Mon Apr 7 19:27:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041650 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 22BABC36010 for ; Mon, 7 Apr 2025 19:28:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1s8i-0001rS-LN; Mon, 07 Apr 2025 15:28:15 -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 1u1s7t-0001gx-F6 for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:26 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1s7r-0002kM-Cm for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:20 -0400 Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 537IQe0D003206 for ; Mon, 7 Apr 2025 19:27:18 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= nPoyTPeZ2tLujlV8Tk9LZrILptSj9Wah/+UCQ5kzrzs=; b=carBK43AvfglKtyC QmJMOjsDs5xe4DtReNWkPxhoc1BOkaPCbBuSA1ik8o5slwIjTqtXZswerh7uTXXL Ta5CGDa5WAfWsoSDLVjOW2wfLiCse3ju9hmqxZ7CLQ4sHCYE5zwas1FHkztF+uc7 y1jpAp9a+B87uo6C0fMALMqfnPCMgudehdzlnyNwfSgs9si5U2YC/oeDSybRnT4i rPq/PmU/RG/dhON1QOFZ0iCdBoSOBnlWZqT7sD/WhcpgUeN/AckOrB/5yDN1WAcH oBOcoBoc0IksxG9BLjW2iE27xo/8TpZHoiuCII2DYpSiqQqNVG/jtPfiDMtZQ/wB ALVQPg== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twftd9b1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 19:27:17 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-736c89461d1so7198328b3a.3 for ; Mon, 07 Apr 2025 12:27:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744054036; x=1744658836; 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=nPoyTPeZ2tLujlV8Tk9LZrILptSj9Wah/+UCQ5kzrzs=; b=eCNuysIm3OBIab9RGCXqetVL9eJj7rSVPqhP+tdJBnU5Hix0kJwpSoF/a+jpPmIeLr USup5l++lHUJMJBdaFSoaUGfMdricCfI/rNjRB5DJ2kwuFYp+x8LG0PS2WKh/4zup3jA cu5U1jvUh858ZaF6jeLxApXgSUKGOjNTuXgcviscB9nVco2grwyQqjB3a/T9lTihupgv AEW5XN0VMkt9insKbaWgnPrmkShSyy68L3KmH83vo1OeMnZtUQbMOtKbq1KN/TjaXkRY mhdzG49zlsCFKoL4RizMPgt3f3/WKxi6pmGD6+6ZsxCsK1ztaTsmbSVCq+vC56z1D/qk E4cw== X-Gm-Message-State: AOJu0YzetQlf5JF5gx3tJXcGKPkpiJZRWVnCRJ/pLcLfehLGDZW+gec4 7Tfty8nCrdP6Pin2aJ+68jVJZBOPBnmSm9YTqD//ryxf3MRYuhUO9CjNTXKPue4HkwSvLj+wpi7 COsLtGgojcLRzCG1xDtONCcqe3rjpeaRYmi12CThcNRVIXioAPgXyNqgsoDWKcQ== X-Gm-Gg: ASbGncvu9cVSZ8qkuFnz902CHThtRS+Hd1kwUh7HN0Hc3eHvDiyjBbDs928Gq1DbwTf WYcH3L+sULhrx/F2UsQ6B3e15jiaiIhKmtov0IdhEIP1rQ6FHEwuCMCYhLEgh5W9N9sQkI+EcDX xY7yGJ9Yb7wTTmo9ouJ2mE7GYRRmDnxRzwtxh0PXYL5fbib8xprwkVj1B8YMCWwLKbYaeL0er1A pRV92dvx0z89f7BnHtBMWt94u8rXBolT/HWUPisnHGhNlCGwpDTQNfV6/QjwHz6uPt8D6Rg35e7 gTTMmzGz3ccEKGDyfHsZJUyPwh7znjgjk9JDWH410iGe67xUf2wevf68QoJPclYV X-Received: by 2002:a05:6a00:1485:b0:736:728b:5f1f with SMTP id d2e1a72fcca58-739e7113b63mr17008707b3a.19.1744054036264; Mon, 07 Apr 2025 12:27:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFGkXf6ENOEvr5GUYc91y26Cqim8ceErbpBPKe6h8h0PzqvJuWdJKymmbUou3QMbshWAkb2gQ== X-Received: by 2002:a05:6a00:1485:b0:736:728b:5f1f with SMTP id d2e1a72fcca58-739e7113b63mr17008685b3a.19.1744054035896; Mon, 07 Apr 2025 12:27:15 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee619sm9206559b3a.52.2025.04.07.12.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 12:27:15 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com Subject: [PATCH v3 3/5] target/hexagon: Add missing A_CALL attr, hintjumpr to multi_cof Date: Mon, 7 Apr 2025 12:27:03 -0700 Message-Id: <20250407192705.2605614-4-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> References: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Authority-Analysis: v=2.4 cv=B5+50PtM c=1 sm=1 tr=0 ts=67f42715 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=ExrS_PMGiXDxMcIyg5oA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-GUID: 1jepcVmVsmSrji2iqAfnTqHCfc63NAGe X-Proofpoint-ORIG-GUID: 1jepcVmVsmSrji2iqAfnTqHCfc63NAGe X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_05,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=715 suspectscore=0 malwarescore=0 bulkscore=0 phishscore=0 spamscore=0 priorityscore=1501 adultscore=0 impostorscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070136 Received-SPF: pass client-ip=205.220.168.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 Signed-off-by: Brian Cain --- target/hexagon/hex_common.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/hexagon/hex_common.py b/target/hexagon/hex_common.py index 6803908718..a2dcb0aa2e 100755 --- a/target/hexagon/hex_common.py +++ b/target/hexagon/hex_common.py @@ -247,8 +247,11 @@ def need_next_PC(tag): def need_pkt_has_multi_cof(tag): - return "A_COF" in attribdict[tag] - + return ( + "A_JUMP" in attribdict[tag] + or "A_CALL" in attribdict[tag] + or "J2_rte" == tag + ) and tag != "J2_hintjumpr" def need_pkt_need_commit(tag): return 'A_IMPLICIT_WRITES_USR' in attribdict[tag] From patchwork Mon Apr 7 19:27:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041651 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 D0019C36010 for ; Mon, 7 Apr 2025 19:29:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1s9Q-0002ER-Jq; Mon, 07 Apr 2025 15:28:56 -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 1u1s7v-0001h5-7E for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:26 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1s7t-0002kY-7k for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:22 -0400 Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 537IxU6i015485 for ; Mon, 7 Apr 2025 19:27:19 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= CC/ulPosjVj3rHSXwyVZxR5V1IPFIwK5Ukzi3JlJm+8=; b=OOyhuD4Bv6A8eTDw hyln4dmwD2LeTX8u2EpqW4KfmuDg86VGz23g8obZznfG3lk+RFxqdneDr+DRwwIE HFx5rB51zpwru+rz7uPk0QFO6lHZAmxQHHifKzKC0PeHAC+PJu8HJyQqQCCssqyC YSHljFeQ2yCp2nvEwgJ4gUOgg6o8zQpcBz2ux5kmlp16Y5TP0VVWALPF5LtZdfz4 RQIvhDH1al9y1MM/gsnj0lu0JCuPU8pJl9kYkzR7k37xABlqj7Fq1FVHFlEeOYUd YVaD549dBRvLZOEalP/c4jxY2Updk+TwIMksZOQsci6P0Y5jUXi30KcvAhPc9Uf4 orN1pA== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twbe5bkx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 19:27:19 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-7395d07a3dcso3565483b3a.3 for ; Mon, 07 Apr 2025 12:27:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744054038; x=1744658838; 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=CC/ulPosjVj3rHSXwyVZxR5V1IPFIwK5Ukzi3JlJm+8=; b=Dcr2I0HZFvRbLn234JwrpsarPI4qtA/jxXp3pcKYirOuMkPByH6V3Zb1Uf813AdbSo BWI9TKWOx5XQsNEouhY4W71ezN1Wn6Dk0RgVL1Y2MNpRoJVNIGGsg2JDj4u96V6h9msH uBtjFDdSFqZ78iXZBErD5bqV43d7/XJnfTwM1uK/K0+Kih67r9Qa971FUIdk8MQXOOsb uoMnByH/h8SsyfLX9/Ed/wZu8WVoLGechXGoDdqraqyXGc+GD7V8JF2kGDVisG9rCPC4 0aqKTr6WJH0FD7FtHBXHqr1R2qCJcGR7ySYwA5dPW6+Pvaq3Hih00IxNtGpqFzOxf7VG oJHA== X-Gm-Message-State: AOJu0YzGVHaUKLXQGNOVcs/sRftZsUFM+ugpYTAutZSJJmk1pDyZVz4G XSrc+ogxFMI4305KitEdLtw0IwMWhxlrvaxNP5Sif3uvpvpua6w/KK019xx6eCdr0jhJMK/3GpK NZkZJhfsxTzlTxq6Sj1OVnQ8Ry2vRape85bQ8lvTKOp2Xgl074rZDTaGTvwIVKA== X-Gm-Gg: ASbGnct5dcpXQbztdQeRMwxE8TmJpB1ihEB3Ad0Hgr9WmLjnh60ip5FyKz1PwyFHx1D pF9OZsYgEVpoGBSJ94zHXlOMp8/VKGZ+b0Eop9jk9+vSTAgUvCHR88LWUZy3b9OSgf2bzcmqcZw CvRkE7ZA1rBhmvO3mqwvkahKWl+0Kkus6kk1kPZWzDeWxXH3xt6HOzNQQPkIcjeKbzv7Glr2Buy xkFzvk0c/FkxzwEXhZSoSRyDD4JT+1hqEbzkSz5RjLNeUPEgKz5o7BR6ekQJfgvDYyJASNSbDEI 2Xw0VK4Xem5MMbYoNAbEewBMR8tjf87b92Bhr5huBbD/S8ShxQySCMJNs20vmqqT X-Received: by 2002:a05:6a00:1411:b0:732:5164:3cc with SMTP id d2e1a72fcca58-739e711fcf5mr17490118b3a.19.1744054038414; Mon, 07 Apr 2025 12:27:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+nLP6THiQNeTvs86dl4b393ycYldZfdge18ZAMRMhC/egGx+AHHYSoSLYshsUzYYgisZo8g== X-Received: by 2002:a05:6a00:1411:b0:732:5164:3cc with SMTP id d2e1a72fcca58-739e711fcf5mr17490075b3a.19.1744054037843; Mon, 07 Apr 2025 12:27:17 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee619sm9206559b3a.52.2025.04.07.12.27.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 12:27:16 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com Subject: [PATCH v3 4/5] target/hexagon: s/pkt_has_store/pkt_has_scalar_store Date: Mon, 7 Apr 2025 12:27:04 -0700 Message-Id: <20250407192705.2605614-5-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> References: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: hYlcEcrvZRLVtBeod8G86MoR0TwuoCXE X-Authority-Analysis: v=2.4 cv=T7OMT+KQ c=1 sm=1 tr=0 ts=67f42717 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=NfTq8dMVL6FJjgmeXnEA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-ORIG-GUID: hYlcEcrvZRLVtBeod8G86MoR0TwuoCXE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_05,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxlogscore=685 lowpriorityscore=0 adultscore=0 phishscore=0 bulkscore=0 mlxscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070136 Received-SPF: pass client-ip=205.220.168.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 To remove any confusion with HVX or other potential store instructions, we'll qualify this context var with "scalar". Signed-off-by: Brian Cain Reviewed-by: Taylor Simpson --- target/hexagon/idef-parser/README.rst | 2 +- target/hexagon/insn.h | 4 ++-- target/hexagon/macros.h | 8 ++++---- target/hexagon/decode.c | 4 ++-- target/hexagon/genptr.c | 3 ++- target/hexagon/idef-parser/parser-helpers.c | 4 ++-- target/hexagon/op_helper.c | 4 ++-- target/hexagon/translate.c | 9 +++++---- target/hexagon/gen_helper_funcs.py | 2 +- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/target/hexagon/idef-parser/README.rst b/target/hexagon/idef-parser/README.rst index 7199177ee3..235e3debee 100644 --- a/target/hexagon/idef-parser/README.rst +++ b/target/hexagon/idef-parser/README.rst @@ -637,7 +637,7 @@ tinycode for the Hexagon ``add`` instruction :: ---- 00021094 - mov_i32 pkt_has_store_s1,$0x0 + mov_i32 pkt_has_scalar_store_s1,$0x0 add_i32 tmp0,r2,r2 mov_i32 loc2,tmp0 mov_i32 new_r1,loc2 diff --git a/target/hexagon/insn.h b/target/hexagon/insn.h index 24dcf7fe9f..5d59430da9 100644 --- a/target/hexagon/insn.h +++ b/target/hexagon/insn.h @@ -66,8 +66,8 @@ struct Packet { bool pkt_has_dczeroa; - bool pkt_has_store_s0; - bool pkt_has_store_s1; + bool pkt_has_scalar_store_s0; + bool pkt_has_scalar_store_s1; bool pkt_has_hvx; Insn *vhist_insn; diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index ee3d4c88e7..b6e5c8aae2 100644 --- a/target/hexagon/macros.h +++ b/target/hexagon/macros.h @@ -82,7 +82,7 @@ */ #define CHECK_NOSHUF(VA, SIZE) \ do { \ - if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \ + if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \ probe_noshuf_load(VA, SIZE, ctx->mem_idx); \ process_store(ctx, 1); \ } \ @@ -93,11 +93,11 @@ TCGLabel *noshuf_label = gen_new_label(); \ tcg_gen_brcondi_tl(TCG_COND_EQ, PRED, 0, noshuf_label); \ GET_EA; \ - if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \ + if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \ probe_noshuf_load(EA, SIZE, ctx->mem_idx); \ } \ gen_set_label(noshuf_label); \ - if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \ + if (insn->slot == 0 && ctx->pkt->pkt_has_scalar_store_s1) { \ process_store(ctx, 1); \ } \ } while (0) @@ -524,7 +524,7 @@ static inline TCGv gen_read_ireg(TCGv result, TCGv val, int shift) #define fLOAD(NUM, SIZE, SIGN, EA, DST) \ do { \ - check_noshuf(env, pkt_has_store_s1, slot, EA, SIZE, GETPC()); \ + check_noshuf(env, pkt_has_scalar_store_s1, slot, EA, SIZE, GETPC()); \ DST = (size##SIZE##SIGN##_t)MEM_LOAD##SIZE(env, EA, GETPC()); \ } while (0) #endif diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index 23deba2426..b5ece60450 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -236,9 +236,9 @@ static void decode_set_insn_attr_fields(Packet *pkt) if (GET_ATTRIB(opcode, A_SCALAR_STORE) && !GET_ATTRIB(opcode, A_MEMSIZE_0B)) { if (pkt->insn[i].slot == 0) { - pkt->pkt_has_store_s0 = true; + pkt->pkt_has_scalar_store_s0 = true; } else { - pkt->pkt_has_store_s1 = true; + pkt->pkt_has_scalar_store_s1 = true; } } } diff --git a/target/hexagon/genptr.c b/target/hexagon/genptr.c index 2c5e15cfcf..7c73772e40 100644 --- a/target/hexagon/genptr.c +++ b/target/hexagon/genptr.c @@ -395,7 +395,8 @@ static inline void gen_store_conditional8(DisasContext *ctx, #ifndef CONFIG_HEXAGON_IDEF_PARSER static TCGv gen_slotval(DisasContext *ctx) { - int slotval = (ctx->pkt->pkt_has_store_s1 & 1) | (ctx->insn->slot << 1); + int slotval = + (ctx->pkt->pkt_has_scalar_store_s1 & 1) | (ctx->insn->slot << 1); return tcg_constant_tl(slotval); } #endif diff --git a/target/hexagon/idef-parser/parser-helpers.c b/target/hexagon/idef-parser/parser-helpers.c index a7dcd85fe4..3316c230f8 100644 --- a/target/hexagon/idef-parser/parser-helpers.c +++ b/target/hexagon/idef-parser/parser-helpers.c @@ -1725,7 +1725,7 @@ void gen_cancel(Context *c, YYLTYPE *locp) void gen_load_cancel(Context *c, YYLTYPE *locp) { - OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n"); + OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_scalar_store_s1) {\n"); OUT(c, locp, "ctx->s1_store_processed = false;\n"); OUT(c, locp, "process_store(ctx, 1);\n"); OUT(c, locp, "}\n"); @@ -1750,7 +1750,7 @@ void gen_load(Context *c, YYLTYPE *locp, HexValue *width, /* Lookup the effective address EA */ find_variable(c, locp, ea, ea); - OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_store_s1) {\n"); + OUT(c, locp, "if (insn->slot == 0 && pkt->pkt_has_scalar_store_s1) {\n"); OUT(c, locp, "probe_noshuf_load(", ea, ", ", width, ", ctx->mem_idx);\n"); OUT(c, locp, "process_store(ctx, 1);\n"); OUT(c, locp, "}\n"); diff --git a/target/hexagon/op_helper.c b/target/hexagon/op_helper.c index 6da8db8ea5..6ff37680d9 100644 --- a/target/hexagon/op_helper.c +++ b/target/hexagon/op_helper.c @@ -463,11 +463,11 @@ void HELPER(probe_pkt_scalar_hvx_stores)(CPUHexagonState *env, int mask) * If the load is in slot 0 and there is a store in slot1 (that * wasn't cancelled), we have to do the store first. */ -static void check_noshuf(CPUHexagonState *env, bool pkt_has_store_s1, +static void check_noshuf(CPUHexagonState *env, bool pkt_has_scalar_store_s1, uint32_t slot, target_ulong vaddr, int size, uintptr_t ra) { - if (slot == 0 && pkt_has_store_s1 && + if (slot == 0 && pkt_has_scalar_store_s1 && ((env->slot_cancelled & (1 << 1)) == 0)) { probe_read(env, vaddr, size, MMU_USER_IDX, ra); commit_store(env, 1, ra); diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index 5271c4e022..aca77dfdb1 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -705,11 +705,11 @@ static void process_store_log(DisasContext *ctx) * the memory accesses overlap. */ Packet *pkt = ctx->pkt; - if (pkt->pkt_has_store_s1) { + if (pkt->pkt_has_scalar_store_s1) { g_assert(!pkt->pkt_has_dczeroa); process_store(ctx, 1); } - if (pkt->pkt_has_store_s0) { + if (pkt->pkt_has_scalar_store_s0) { g_assert(!pkt->pkt_has_dczeroa); process_store(ctx, 0); } @@ -834,8 +834,9 @@ static void gen_commit_packet(DisasContext *ctx) * involved in committing the packet. */ Packet *pkt = ctx->pkt; - bool has_store_s0 = pkt->pkt_has_store_s0; - bool has_store_s1 = (pkt->pkt_has_store_s1 && !ctx->s1_store_processed); + bool has_store_s0 = pkt->pkt_has_scalar_store_s0; + bool has_store_s1 = + (pkt->pkt_has_scalar_store_s1 && !ctx->s1_store_processed); bool has_hvx_store = pkt_has_hvx_store(pkt); if (pkt->pkt_has_dczeroa) { /* diff --git a/target/hexagon/gen_helper_funcs.py b/target/hexagon/gen_helper_funcs.py index c1f806ac4b..a9c0e27a80 100755 --- a/target/hexagon/gen_helper_funcs.py +++ b/target/hexagon/gen_helper_funcs.py @@ -69,7 +69,7 @@ def gen_helper_function(f, tag, tagregs, tagimms): if hex_common.need_slot(tag): if "A_LOAD" in hex_common.attribdict[tag]: f.write(hex_common.code_fmt(f"""\ - bool pkt_has_store_s1 = slotval & 0x1; + bool pkt_has_scalar_store_s1 = slotval & 0x1; """)) f.write(hex_common.code_fmt(f"""\ uint32_t slot = slotval >> 1; From patchwork Mon Apr 7 19:27:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cain X-Patchwork-Id: 14041649 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 E579FC36010 for ; Mon, 7 Apr 2025 19:28:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1s8h-0001qX-2j; Mon, 07 Apr 2025 15:28:12 -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 1u1s7v-0001hB-Hg for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:26 -0400 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1s7u-0002kg-03 for qemu-devel@nongnu.org; Mon, 07 Apr 2025 15:27:23 -0400 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 537Iev58002203 for ; Mon, 7 Apr 2025 19:27:20 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= 0JNy0H8rZ3mqJbvaSLWvLnEsqqiwOr/aprP21Ezpjjs=; b=XE/B4tm5cy/35HBX CoEuSEw10M6oepe21VccPYl43UJAMxJ1O0kwqkgBqfzRsOW+IF//cJcCyPOhTNBY iu1UZqx+gbdKiwIWcVMBQgrmLTz0SXtU7cvDHIkHTqkmS8yh3uawQSs17VR0ppoV CmqHAfwJUewU/UAYJVU25VCPkWPxcDaN2KDqU0Gh81gtykeYI/slSNLe+Q7CI6xJ SUKub3CKdraYxoU1kgTumoPirxeSl/o0otpPDVa77696stdGY0jh9i/+Y96npCKh IRIJ1iwLpd4vqBfsC/emqEPInfrV6jvi2yuHWn8zsWv6NtnpqtZQ+k8WL5lhhal+ GNx+aw== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 45twtawbra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Apr 2025 19:27:20 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-736cb72efd5so4134362b3a.3 for ; Mon, 07 Apr 2025 12:27:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744054039; x=1744658839; 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=0JNy0H8rZ3mqJbvaSLWvLnEsqqiwOr/aprP21Ezpjjs=; b=JN0aTkdpSWr0WvsAtDalGtGkhub54fNaVSb5vkVuezuWtKqZQrLtZjdEV1kifdLk01 qejk1fICY+iwbpH7o9Z7K7wc/g2D9T0cxSNqdJ7+cGYj+JLlUVkdq6imCLhTMMkuwAY7 h5W3x96cHnu/aH77+FrnPBH1imxSjs6uINdEyfCD5OfeCM573rbTOf3NK+wHMLLmX6pJ JKmE3o0986//b4mi/6/VUt7gN+Q0YdSRKLxOYGoAqBKm9AGbAgUEKWPZGI9fmmE/Zetd s92aMxZCWR//AdyTkhwIma/CjV6A2PcLfdCVBVFLpAt+zOgg3mh+6UXUyYiA8R13q5JI y8wA== X-Gm-Message-State: AOJu0YztUNBGhH800yc/fiVHonPVYEB2bsC5vUQ6lSIj+9dVEUUqPnUt WFG5lSk625gQPqPqQwgoTtw6mnYKN5m9MqKswIvRgPFg94I2UUcYLyxsqdQaJAMoiEV0ZAa23mI ntx3SUOf1BrErFa2wrtGXWxm5bs7lziJILo68MI3bfMcYj/Mr+3e9aNBtACDviQ== X-Gm-Gg: ASbGncuAuri52VPjfMFlKcIfuIcPDed8oiORrAjKl0xCdQLPSP37PqTaEdab62c9t3j wub3mKpXZQNn3DTbwshnqn82X691LRyywfV8lsKITJ/hhn0/5yrhWSqfte+TEr6R+Df93tmGZay zvSD7aza/uY2LaXMJR3EUQ9u0TmsN17MWpFRDDyftt6b06rmEBOgpGkV5Vj4r06HCmxuq9vvlQO 9DeY1JtiO7jYWSidD10P3IPCNrMi7fUqExujKlx41AVnzJQtvh+mCE8x7X6cY+rpcF5Da1OAnoY 2wUed310cwzmSmnvhlS70uYPyr4lyW80abcNoNmCHm5NipHDHlaG0HGqjXdxt6kr X-Received: by 2002:a05:6a00:244b:b0:736:450c:fa56 with SMTP id d2e1a72fcca58-739e6fa9cfamr14551789b3a.5.1744054039358; Mon, 07 Apr 2025 12:27:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKt0SgA+ox6gfndudPGmsMONQJztQ01Z57Zr14sCFVS7+ZRu8K0WJldGkf8Iejw+VUaeI3pA== X-Received: by 2002:a05:6a00:244b:b0:736:450c:fa56 with SMTP id d2e1a72fcca58-739e6fa9cfamr14551768b3a.5.1744054038989; Mon, 07 Apr 2025 12:27:18 -0700 (PDT) Received: from hu-bcain-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-739d97ee619sm9206559b3a.52.2025.04.07.12.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 12:27:18 -0700 (PDT) From: Brian Cain To: qemu-devel@nongnu.org Cc: brian.cain@oss.qualcomm.com, richard.henderson@linaro.org, philmd@linaro.org, matheus.bernardino@oss.qualcomm.com, ale@rev.ng, anjo@rev.ng, marco.liebel@oss.qualcomm.com, ltaylorsimpson@gmail.com, alex.bennee@linaro.org, quic_mburton@quicinc.com, sidneym@quicinc.com Subject: [PATCH v3 5/5] target/hexagon: Remove unreachable Date: Mon, 7 Apr 2025 12:27:05 -0700 Message-Id: <20250407192705.2605614-6-brian.cain@oss.qualcomm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> References: <20250407192705.2605614-1-brian.cain@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: 6WOOfMzrVNzNTsg0WRzLyjFzTvi83AeG X-Authority-Analysis: v=2.4 cv=LLlmQIW9 c=1 sm=1 tr=0 ts=67f42718 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=EUspDBNiAAAA:8 a=WeWQB0ruK5ITHrmzxTQA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: 6WOOfMzrVNzNTsg0WRzLyjFzTvi83AeG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-07_05,2025-04-07_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 clxscore=1015 mlxlogscore=706 malwarescore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 spamscore=0 adultscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504070136 Received-SPF: pass client-ip=205.220.168.131; envelope-from=brian.cain@oss.qualcomm.com; helo=mx0a-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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 We should raise an exception in the event that we encounter a packet that can't be correctly decoded, not fault. Signed-off-by: Brian Cain --- target/hexagon/decode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index b5ece60450..1db7f1950f 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -489,7 +489,6 @@ decode_insns(DisasContext *ctx, Insn *insn, uint32_t encoding) insn->iclass = iclass_bits(encoding); return 1; } - g_assert_not_reached(); } else { uint32_t iclass = get_duplex_iclass(encoding); unsigned int slot0_subinsn = get_slot0_subinsn(encoding); @@ -512,6 +511,11 @@ decode_insns(DisasContext *ctx, Insn *insn, uint32_t encoding) } g_assert_not_reached(); } + /* + * invalid/unrecognized opcode; return 1 and let gen_insn() raise an + * exception when it sees this empty insn. + */ + return 1; } static void decode_add_endloop_insn(Insn *insn, int loopnum)