From nobody Tue Feb 10 15:45:43 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; dmarc=pass(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1678167435; cv=none; d=zohomail.com; s=zohoarc; b=OeVuXJGEoW3FFU52uOAExqdDDZyqx8zBqy8sczzyX6n8fdgPFjwb8Sw8+i7+/Sh4XyIjr5NULgas4PU2jSwrHBcp0bxEJgvSKVDYTPclZE00K4O4RlYyOELMf48pKEeupyP/uFZP/JVMX0KANRty134usH+nydfFn9yELOCVdc0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678167435; h=Content-Type: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=GiCW+DLTtd2XkGE1lsYjYSz1SmmxnqnwAhb2J1p8748=; b=cmjv2aiZ4tmAt9xgrCj0a51Vna3ISFcXDxa4kP3XRXzVw3jxFwskQcy6UdfInyyITGXMD3TI833QAlFeLPVAi7PFN4akI/k+caZUc1Cw0RE/0OhxW0ASjl4smeYS6JR4oWuvYb1D1oQ/zH2+hYfbogu4LJrWmEC/8TIUSlW9sjk= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678167435785404.6114645448189; Mon, 6 Mar 2023 21:37:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZPyc-0006nn-GD; Tue, 07 Mar 2023 00:35:06 -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 1pZPyO-0006XP-Dn for qemu-devel@nongnu.org; Tue, 07 Mar 2023 00:34:53 -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 1pZPyJ-0006Yb-4V for qemu-devel@nongnu.org; Tue, 07 Mar 2023 00:34:52 -0500 Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3273W8mo009753; Tue, 7 Mar 2023 05:34:45 GMT Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3p5wee882w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Mar 2023 05:34:44 +0000 Received: from pps.filterd (NALASPPMTA05.qualcomm.com [127.0.0.1]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTP id 3275YhUb018566; Tue, 7 Mar 2023 05:34:43 GMT Received: from pps.reinject (localhost [127.0.0.1]) by NALASPPMTA05.qualcomm.com (PPS) with ESMTPS id 3p4ffd4g00-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Mar 2023 05:34:43 +0000 Received: from NALASPPMTA05.qualcomm.com (NALASPPMTA05.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3275YhVw018556; Tue, 7 Mar 2023 05:34:43 GMT Received: from hu-devc-sd-u20-a-1.qualcomm.com (hu-tsimpson-lv.qualcomm.com [10.47.204.221]) by NALASPPMTA05.qualcomm.com (PPS) with ESMTPS id 3275Yg3C018549 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 07 Mar 2023 05:34:43 +0000 Received: by hu-devc-sd-u20-a-1.qualcomm.com (Postfix, from userid 47164) id 8B31268C; Mon, 6 Mar 2023 21:34:42 -0800 (PST) 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=GiCW+DLTtd2XkGE1lsYjYSz1SmmxnqnwAhb2J1p8748=; b=W/ye5abLnGoTQirh7kka3/rnlvN36PBKyoumkP/1jLRxiknozY4ah4O0Z91hCRqPX+Ey 3noakOuKJh28Q5UZQawXa1NHTgFGEsGX+O22JFHtNbf4jWBzzyASLsVBYbjINCJ7XXzJ jYkfRUy0l2h5FPSxRmWzKNuUF8stF6A+wjLbHP4W3PpIXb5jnaQ770ic+8+nTb8buyyW wseQrT8YI6sn7q2AZkxjdWWvYWlP1433jkha1FktZiL3IiMwf2y7pLY1WmR11AbuGLIc XWzcfXRmoHnglnlwdj3fD+CVfCG6Y7B+MEK+RlJK/rGS9/zElDGmuG+pydC93wgGfJ+7 Fg== From: Taylor Simpson To: qemu-devel@nongnu.org Cc: tsimpson@quicinc.com, richard.henderson@linaro.org, philmd@linaro.org, peter.maydell@linaro.org, bcain@quicinc.com, quic_mathbern@quicinc.com, stefanha@redhat.com, ale@rev.ng, anjo@rev.ng Subject: [PULL 03/17] target/hexagon/idef-parser: Remove unused code paths Date: Mon, 6 Mar 2023 21:34:24 -0800 Message-Id: <20230307053438.2416629-4-tsimpson@quicinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230307053438.2416629-1-tsimpson@quicinc.com> References: <20230307053438.2416629-1-tsimpson@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: Gp4GLf7TmeWRckCEc-Qm1SgpHwli1RwD X-Proofpoint-ORIG-GUID: Gp4GLf7TmeWRckCEc-Qm1SgpHwli1RwD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-06_14,2023-03-06_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 adultscore=0 mlxlogscore=648 priorityscore=1501 phishscore=0 clxscore=1015 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303070049 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=tsimpson@qualcomm.com; helo=mx0b-0031df01.pphosted.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @quicinc.com) X-ZM-MESSAGEID: 1678167437704100003 From: Anton Johansson Removes code paths used by COF instructions, which are no longer processed by idef-parser. Tested-by: Taylor Simpson Reviewed-by: Taylor Simpson Signed-off-by: Taylor Simpson Signed-off-by: Anton Johansson Message-Id: <20230131223133.8592-1-anjo@rev.ng> --- target/hexagon/idef-parser/idef-parser.h | 1 - target/hexagon/idef-parser/parser-helpers.c | 3 -- target/hexagon/idef-parser/idef-parser.lex | 27 +------------ target/hexagon/idef-parser/idef-parser.y | 44 +-------------------- target/hexagon/idef-parser/macros.inc | 9 ----- 5 files changed, 4 insertions(+), 80 deletions(-) diff --git a/target/hexagon/idef-parser/idef-parser.h b/target/hexagon/idef= -parser/idef-parser.h index 17d2ebfaf6..d23e71f13b 100644 --- a/target/hexagon/idef-parser/idef-parser.h +++ b/target/hexagon/idef-parser/idef-parser.h @@ -82,7 +82,6 @@ enum ImmUnionTag { VALUE, QEMU_TMP, IMM_PC, - IMM_NPC, IMM_CONSTEXT, }; =20 diff --git a/target/hexagon/idef-parser/parser-helpers.c b/target/hexagon/i= def-parser/parser-helpers.c index 7b494c2f9e..cc2cd000db 100644 --- a/target/hexagon/idef-parser/parser-helpers.c +++ b/target/hexagon/idef-parser/parser-helpers.c @@ -185,9 +185,6 @@ void imm_print(Context *c, YYLTYPE *locp, HexImm *imm) case IMM_PC: EMIT(c, "ctx->base.pc_next"); break; - case IMM_NPC: - EMIT(c, "ctx->npc"); - break; case IMM_CONSTEXT: EMIT(c, "insn->extension_valid"); break; diff --git a/target/hexagon/idef-parser/idef-parser.lex b/target/hexagon/id= ef-parser/idef-parser.lex index ff87a02c3a..2658d9fb2e 100644 --- a/target/hexagon/idef-parser/idef-parser.lex +++ b/target/hexagon/idef-parser/idef-parser.lex @@ -140,8 +140,6 @@ STRING_LIT \"(\\.|[^"\\])*\" yylval->rvalue.is_dotnew =3D true; yylval->rvalue.signedness =3D SIGNED; return PRED; } -"IV1DEAD()" | -"fPAUSE(uiV);" { return ';'; } "+=3D" { return INC; } "-=3D" { return DEC; } "++" { return PLUSPLUS; } @@ -159,9 +157,8 @@ STRING_LIT \"(\\.|[^"\\])*\" "else" { return ELSE; } "for" { return FOR; } "fREAD_IREG" { return ICIRC; } -"fPART1" { return PART1; } "if" { return IF; } -"fFRAME_SCRAMBLE" { return FSCR; } +"fFRAME_SCRAMBLE" | "fFRAME_UNSCRAMBLE" { return FSCR; } "fFRAMECHECK" { return FCHK; } "Constant_extended" { return CONSTEXT; } @@ -312,11 +309,7 @@ STRING_LIT \"(\\.|[^"\\])*\" "(unsigned int)" { yylval->cast.bit_width =3D 32; yylval->cast.signedness =3D UNSIGNED; return CAST; } -"fREAD_PC()" | -"PC" { return PC; } -"fREAD_NPC()" | -"NPC" { return NPC; } -"fGET_LPCFG" | +"fREAD_PC()" { return PC; } "USR.LPCFG" { return LPCFG; } "LOAD_CANCEL(EA)" { return LOAD_CANCEL; } "STORE_CANCEL(EA)" | @@ -360,14 +353,6 @@ STRING_LIT \"(\\.|[^"\\])*\" yylval->rvalue.bit_width =3D 32; yylval->rvalue.signedness =3D UNSIGNED; return REG; } -"fREAD_LC"[01] { yylval->rvalue.type =3D REGISTER; - yylval->rvalue.reg.type =3D CONTROL; - yylval->rvalue.reg.id =3D HEX_REG_LC0 - + (yytext[8] - '0') * 2; - yylval->rvalue.reg.bit_width =3D 32; - yylval->rvalue.bit_width =3D 32; - yylval->rvalue.signedness =3D UNSIGNED; - return REG; } "LC"[01] { yylval->rvalue.type =3D REGISTER; yylval->rvalue.reg.type =3D CONTROL; yylval->rvalue.reg.id =3D HEX_REG_LC0 @@ -376,14 +361,6 @@ STRING_LIT \"(\\.|[^"\\])*\" yylval->rvalue.bit_width =3D 32; yylval->rvalue.signedness =3D UNSIGNED; return REG; } -"fREAD_SA"[01] { yylval->rvalue.type =3D REGISTER; - yylval->rvalue.reg.type =3D CONTROL; - yylval->rvalue.reg.id =3D HEX_REG_SA0 - + (yytext[8] - '0') * 2; - yylval->rvalue.reg.bit_width =3D 32; - yylval->rvalue.bit_width =3D 32; - yylval->rvalue.signedness =3D UNSIGNED; - return REG; } "SA"[01] { yylval->rvalue.type =3D REGISTER; yylval->rvalue.reg.type =3D CONTROL; yylval->rvalue.reg.id =3D HEX_REG_SA0 diff --git a/target/hexagon/idef-parser/idef-parser.y b/target/hexagon/idef= -parser/idef-parser.y index c784726d41..d7b2199b74 100644 --- a/target/hexagon/idef-parser/idef-parser.y +++ b/target/hexagon/idef-parser/idef-parser.y @@ -52,8 +52,8 @@ %token IN INAME VAR %token ABS CROUND ROUND CIRCADD COUNTONES INC DEC ANDA ORA XORA PLUSPLUS A= SL %token ASR LSR EQ NEQ LTE GTE MIN MAX ANDL FOR ICIRC IF MUN FSCR FCHK SXT -%token ZXT CONSTEXT LOCNT BREV SIGN LOAD STORE PC NPC LPCFG -%token LOAD_CANCEL CANCEL IDENTITY PART1 ROTL INSBITS SETBITS EXTRANGE +%token ZXT CONSTEXT LOCNT BREV SIGN LOAD STORE PC LPCFG +%token LOAD_CANCEL CANCEL IDENTITY ROTL INSBITS SETBITS EXTRANGE %token CAST4_8U FAIL CARRY_FROM_ADD ADDSAT64 LSBNEW %token TYPE_SIZE_T TYPE_INT TYPE_SIGNED TYPE_UNSIGNED TYPE_LONG =20 @@ -336,15 +336,6 @@ assign_statement : lvalue '=3D' rvalue OUT(c, &@1, &$1, " =3D ", &$3, ";\n"); $$ =3D $1; } - | PC '=3D' rvalue - { - @1.last_column =3D @3.last_column; - yyassert(c, &@1, !is_inside_ternary(c), - "Assignment side-effect not modeled!"); - $3 =3D gen_rvalue_truncate(c, &@1, &$3); - $3 =3D rvalue_materialize(c, &@1, &$3); - OUT(c, &@1, "gen_write_new_pc(", &$3, ");\n"); - } | LOAD '(' IMM ',' IMM ',' SIGN ',' var ',' lvalue ')' { @1.last_column =3D @12.last_column; @@ -412,7 +403,6 @@ control_statement : frame_check | cancel_statement | if_statement | for_statement - | fpart1_statement ; =20 frame_check : FCHK '(' rvalue ',' rvalue ')' ';' @@ -462,17 +452,6 @@ for_statement : FOR '(' IMM '=3D' IMM ';' IMM '<' IMM = ';' IMM PLUSPLUS ')' } ; =20 -fpart1_statement : PART1 - { - OUT(c, &@1, "if (insn->part1) {\n"); - } - '(' statements ')' - { - @1.last_column =3D @3.last_column; - OUT(c, &@1, "return; }\n"); - } - ; - if_stmt : IF '(' rvalue ')' { @1.last_column =3D @3.last_column; @@ -512,20 +491,6 @@ rvalue : FAIL rvalue.signedness =3D UNSIGNED; $$ =3D rvalue; } - | NPC - { - /* - * NPC is only read from CALLs, so we can hardcode it - * at translation time - */ - HexValue rvalue; - memset(&rvalue, 0, sizeof(HexValue)); - rvalue.type =3D IMMEDIATE; - rvalue.imm.type =3D IMM_NPC; - rvalue.bit_width =3D 32; - rvalue.signedness =3D UNSIGNED; - $$ =3D rvalue; - } | CONSTEXT { HexValue rvalue; @@ -781,11 +746,6 @@ rvalue : FAIL /* Ones count */ $$ =3D gen_ctpop_op(c, &@1, &$3); } - | LPCFG - { - $$ =3D gen_tmp(c, &@1, 32, UNSIGNED); - OUT(c, &@1, "GET_USR_FIELD(USR_LPCFG, ", &$$, ");\n"); - } | EXTRACT '(' rvalue ',' rvalue ')' { @1.last_column =3D @6.last_column; diff --git a/target/hexagon/idef-parser/macros.inc b/target/hexagon/idef-pa= rser/macros.inc index 6b697da87a..7478d4db17 100644 --- a/target/hexagon/idef-parser/macros.inc +++ b/target/hexagon/idef-parser/macros.inc @@ -97,16 +97,8 @@ #define fWRITE_LR(A) (LR =3D A) #define fWRITE_FP(A) (FP =3D A) #define fWRITE_SP(A) (SP =3D A) -/* - * Note: There is a rule in the parser that matches `PC =3D ...` and emits - * a call to `gen_write_new_pc`. We need to call `gen_write_new_pc` to - * get the correct semantics when there are multiple stores in a packet. - */ -#define fBRANCH(LOC, TYPE) (PC =3D LOC) -#define fJUMPR(REGNO, TARGET, TYPE) (PC =3D TARGET) #define fWRITE_LOOP_REGS0(START, COUNT) SA0 =3D START; (LC0 =3D COUNT) #define fWRITE_LOOP_REGS1(START, COUNT) SA1 =3D START; (LC1 =3D COUNT) -#define fWRITE_LC0(VAL) (LC0 =3D VAL) #define fWRITE_LC1(VAL) (LC1 =3D VAL) #define fSET_LPCFG(VAL) (USR.LPCFG =3D VAL) #define fWRITE_P0(VAL) P0 =3D VAL; @@ -121,7 +113,6 @@ #define fEA_GPI(IMM) (EA =3D fREAD_GP() + IMM) #define fPM_I(REG, IMM) (REG =3D REG + IMM) #define fPM_M(REG, MVAL) (REG =3D REG + MVAL) -#define fWRITE_NPC(VAL) (PC =3D VAL) =20 /* Unary operators */ #define fROUND(A) (A + 0x8000) --=20 2.25.1