From nobody Mon Nov 25 13:53:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=quicinc.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714963436606215.33413279321553; Sun, 5 May 2024 19:43:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s3oJq-0000fn-98; Sun, 05 May 2024 22:43:10 -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 1s3oJn-0000eY-QS for qemu-devel@nongnu.org; Sun, 05 May 2024 22:43:07 -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 1s3oJl-0007XR-Nf for qemu-devel@nongnu.org; Sun, 05 May 2024 22:43:07 -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 4461wkmi010938; Mon, 6 May 2024 02:42:53 GMT Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3xwcbpjg49-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 May 2024 02:42:52 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 4462gpvP004844 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 May 2024 02:42:51 GMT Received: from hu-bcain-lv.qualcomm.com (10.49.16.6) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Sun, 5 May 2024 19:42:50 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s= qcppdkim1; bh=BaXrFYYBCvw4I3jFrVOG/FGYV0tP37Upv6IG1zTAo6I=; b=Ac nOoVNXjg9Nm/IlF0hhe3J17ucU/Nvbipmi7ofTb6bXU5PBi5+XSrPqFR79q7Jblu vH+oWRMofyQBl2de8luAOLD0w0tGXHXYt22nJEID2SH1c6oixw4/mW+bgCol+s8D R5vQEM6cjOriydEeOgVeV4LeboIS/DdS0OeCWlmAZpE6LkzuqXmExsTetA9uyzPH 0ZvF4Xyr+aEOgLBQSTX6f/Zzkk7VGSSPUl9TVaqPCzMqrPqaOXNu04fTNGoe4cJl hrHZS0hcWDHQCU61XI78kG44U4MgwH8M82pvHWnPFiRyuz21FeStoGhRhJ0qT6nm nrfbHoi2X6Rr8B7JP2jA== From: Brian Cain To: CC: , , , , , , , , , , Subject: [PULL 12/15] Hexagon (target/hexagon) Remove uses of op_regs_generated.h.inc Date: Sun, 5 May 2024 19:42:24 -0700 Message-ID: <20240506024227.3345791-13-bcain@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240506024227.3345791-1-bcain@quicinc.com> References: <20240506024227.3345791-1-bcain@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.49.16.6] X-ClientProxiedBy: nalasex01c.na.qualcomm.com (10.47.97.35) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: qbeR4svPRlNNlsWWk0idaLWtX0cZbrN3 X-Proofpoint-GUID: qbeR4svPRlNNlsWWk0idaLWtX0cZbrN3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1011,Hydra:6.0.650,FMLib:17.11.176.26 definitions=2024-05-05_17,2024-05-03_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 adultscore=0 impostorscore=0 mlxscore=0 suspectscore=0 phishscore=0 priorityscore=1501 clxscore=1015 spamscore=0 mlxlogscore=914 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2404010003 definitions=main-2405060012 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=205.220.180.131; envelope-from=bcain@quicinc.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1714963437012100005 From: Taylor Simpson Signed-off-by: Taylor Simpson Reviewed-by: Brian Cain Message-Id: <20240307032327.4799-7-ltaylorsimpson@gmail.com> Signed-off-by: Brian Cain --- target/hexagon/decode.c | 55 +++---------------------- target/hexagon/mmvec/decode_ext_mmvec.c | 34 ++++----------- target/hexagon/opcodes.c | 28 ------------- target/hexagon/opcodes.h | 4 -- 4 files changed, 12 insertions(+), 109 deletions(-) diff --git a/target/hexagon/decode.c b/target/hexagon/decode.c index 84a3899556..23deba2426 100644 --- a/target/hexagon/decode.c +++ b/target/hexagon/decode.c @@ -115,24 +115,13 @@ static void decode_fill_newvalue_regno(Packet *packet) { int i, use_regidx, offset, def_idx, dst_idx; - uint16_t def_opcode, use_opcode; - char *dststr; =20 for (i =3D 1; i < packet->num_insns; i++) { if (GET_ATTRIB(packet->insn[i].opcode, A_DOTNEWVALUE) && !GET_ATTRIB(packet->insn[i].opcode, A_EXTENSION)) { - use_opcode =3D packet->insn[i].opcode; =20 - /* It's a store, so we're adjusting the Nt field */ - if (GET_ATTRIB(use_opcode, A_STORE)) { - use_regidx =3D strchr(opcode_reginfo[use_opcode], 't') - - opcode_reginfo[use_opcode]; - } else { /* It's a Jump, so we're adjusting the Ns field */ - use_regidx =3D strchr(opcode_reginfo[use_opcode], 's') - - opcode_reginfo[use_opcode]; - } - g_assert(packet->insn[i].new_read_idx !=3D -1 && - packet->insn[i].new_read_idx =3D=3D use_regidx); + g_assert(packet->insn[i].new_read_idx !=3D -1); + use_regidx =3D packet->insn[i].new_read_idx; =20 /* * What's encoded at the N-field is the offset to who's produc= ing @@ -153,39 +142,9 @@ decode_fill_newvalue_regno(Packet *packet) */ g_assert(!((def_idx < 0) || (def_idx > (packet->num_insns - 1)= ))); =20 - /* - * packet->insn[def_idx] is the producer - * Figure out which type of destination it produces - * and the corresponding index in the reginfo - */ - def_opcode =3D packet->insn[def_idx].opcode; - dststr =3D strstr(opcode_wregs[def_opcode], "Rd"); - if (dststr) { - dststr =3D strchr(opcode_reginfo[def_opcode], 'd'); - } else { - dststr =3D strstr(opcode_wregs[def_opcode], "Rx"); - if (dststr) { - dststr =3D strchr(opcode_reginfo[def_opcode], 'x'); - } else { - dststr =3D strstr(opcode_wregs[def_opcode], "Re"); - if (dststr) { - dststr =3D strchr(opcode_reginfo[def_opcode], 'e'); - } else { - dststr =3D strstr(opcode_wregs[def_opcode], "Ry"); - if (dststr) { - dststr =3D strchr(opcode_reginfo[def_opcode], = 'y'); - } else { - g_assert_not_reached(); - } - } - } - } - g_assert(dststr !=3D NULL); - /* Now patch up the consumer with the register number */ - dst_idx =3D dststr - opcode_reginfo[def_opcode]; - g_assert(packet->insn[def_idx].dest_idx !=3D -1 && - packet->insn[def_idx].dest_idx =3D=3D dst_idx); + g_assert(packet->insn[def_idx].dest_idx !=3D -1); + dst_idx =3D packet->insn[def_idx].dest_idx; packet->insn[i].regno[use_regidx] =3D packet->insn[def_idx].regno[dst_idx]; /* @@ -366,11 +325,7 @@ static void decode_shuffle_for_execution(Packet *packe= t) for (flag =3D false, i =3D 0; i < last_insn + 1; i++) { int opcode =3D packet->insn[i].opcode; =20 - g_assert(packet->insn[i].has_pred_dest =3D=3D - (strstr(opcode_wregs[opcode], "Pd4") || - strstr(opcode_wregs[opcode], "Pe4"))); - if ((strstr(opcode_wregs[opcode], "Pd4") || - strstr(opcode_wregs[opcode], "Pe4")) && + if (packet->insn[i].has_pred_dest && GET_ATTRIB(opcode, A_STORE) =3D=3D 0) { /* This should be a compare (not a store conditional) */ if (flag) { diff --git a/target/hexagon/mmvec/decode_ext_mmvec.c b/target/hexagon/mmvec= /decode_ext_mmvec.c index c1320406df..f850d0154d 100644 --- a/target/hexagon/mmvec/decode_ext_mmvec.c +++ b/target/hexagon/mmvec/decode_ext_mmvec.c @@ -28,21 +28,15 @@ check_new_value(Packet *pkt) { /* .new value for a MMVector store */ int i, j; - const char *reginfo; - const char *destletters; - const char *dststr =3D NULL; uint16_t def_opcode; - char letter; =20 for (i =3D 1; i < pkt->num_insns; i++) { uint16_t use_opcode =3D pkt->insn[i].opcode; if (GET_ATTRIB(use_opcode, A_DOTNEWVALUE) && GET_ATTRIB(use_opcode, A_CVI) && GET_ATTRIB(use_opcode, A_STORE)) { - int use_regidx =3D strchr(opcode_reginfo[use_opcode], 's') - - opcode_reginfo[use_opcode]; - g_assert(pkt->insn[i].new_read_idx !=3D -1 && - pkt->insn[i].new_read_idx =3D=3D use_regidx); + int use_regidx =3D pkt->insn[i].new_read_idx; + g_assert(pkt->insn[i].new_read_idx !=3D -1); /* * What's encoded at the N-field is the offset to who's produc= ing * the value. @@ -70,33 +64,19 @@ check_new_value(Packet *pkt) =20 /* def_idx is the index of the producer */ def_opcode =3D pkt->insn[def_idx].opcode; - reginfo =3D opcode_reginfo[def_opcode]; - destletters =3D "dexy"; - for (j =3D 0; (letter =3D destletters[j]) !=3D 0; j++) { - dststr =3D strchr(reginfo, letter); - if (dststr !=3D NULL) { - break; - } - } - if ((dststr =3D=3D NULL) && GET_ATTRIB(def_opcode, A_CVI_GATH= ER)) { + if ((pkt->insn[def_idx].dest_idx =3D=3D -1) && + GET_ATTRIB(def_opcode, A_CVI_GATHER)) { pkt->insn[i].regno[use_regidx] =3D def_oreg; pkt->insn[i].new_value_producer_slot =3D pkt->insn[def_idx= ].slot; } else { - if (dststr =3D=3D NULL) { + if (pkt->insn[def_idx].dest_idx =3D=3D -1) { /* still not there, we have a bad packet */ g_assert_not_reached(); } - g_assert(pkt->insn[def_idx].dest_idx !=3D -1 && - pkt->insn[def_idx].dest_idx =3D=3D dststr - regin= fo); - int def_regnum =3D pkt->insn[def_idx].regno[dststr - regin= fo]; + int def_regnum =3D + pkt->insn[def_idx].regno[pkt->insn[def_idx].dest_idx]; /* Now patch up the consumer with the register number */ pkt->insn[i].regno[use_regidx] =3D def_regnum ^ def_oreg; - /* special case for (Vx,Vy) */ - dststr =3D strchr(reginfo, 'y'); - if (def_oreg && strchr(reginfo, 'x') && dststr) { - def_regnum =3D pkt->insn[def_idx].regno[dststr - regin= fo]; - pkt->insn[i].regno[use_regidx] =3D def_regnum; - } /* * We need to remember who produces this value to later * check if it was dynamically cancelled diff --git a/target/hexagon/opcodes.c b/target/hexagon/opcodes.c index 1f7f3def38..02ae9cf787 100644 --- a/target/hexagon/opcodes.c +++ b/target/hexagon/opcodes.c @@ -36,34 +36,6 @@ const char * const opcode_names[] =3D { #undef OPCODE }; =20 -const char * const opcode_reginfo[] =3D { -#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2) /* nothin= g */ -#define REGINFO(TAG, REGINFO, RREGS, WREGS) REGINFO, -#include "op_regs_generated.h.inc" - NULL -#undef REGINFO -#undef IMMINFO -}; - - -const char * const opcode_rregs[] =3D { -#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2) /* nothin= g */ -#define REGINFO(TAG, REGINFO, RREGS, WREGS) RREGS, -#include "op_regs_generated.h.inc" - NULL -#undef REGINFO -#undef IMMINFO -}; - - -const char * const opcode_wregs[] =3D { -#define IMMINFO(TAG, SIGN, SIZE, SHAMT, SIGN2, SIZE2, SHAMT2) /* nothin= g */ -#define REGINFO(TAG, REGINFO, RREGS, WREGS) WREGS, -#include "op_regs_generated.h.inc" - NULL -#undef REGINFO -#undef IMMINFO -}; =20 const char * const opcode_short_semantics[] =3D { #define DEF_SHORTCODE(TAG, SHORTCODE) [TAG] =3D #SHORTCODE, diff --git a/target/hexagon/opcodes.h b/target/hexagon/opcodes.h index fa7e321950..0ee11bd445 100644 --- a/target/hexagon/opcodes.h +++ b/target/hexagon/opcodes.h @@ -40,10 +40,6 @@ typedef enum { =20 extern const char * const opcode_names[]; =20 -extern const char * const opcode_reginfo[]; -extern const char * const opcode_rregs[]; -extern const char * const opcode_wregs[]; - typedef struct { const char * const encoding; const EncClass enc_class; --=20 2.25.1