From patchwork Sat Jun 4 23:10:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 578755 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp2783712max; Sat, 4 Jun 2022 16:12:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqH/41RqM2/smP5VQ2qwMgt+0oYkaOQLxkIABIx8CYyKqXn2jw8Oe2TtFNNjAhOOYmeOBT X-Received: by 2002:a05:622a:610:b0:302:eca8:6376 with SMTP id z16-20020a05622a061000b00302eca86376mr13131403qta.18.1654384336747; Sat, 04 Jun 2022 16:12:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654384336; cv=none; d=google.com; s=arc-20160816; b=x9aAGtSlPUnx2cXJz9pq/A0NpregSCw27GkzFFDcC93eF3U/K+06qZstXdmXkxBD/5 7ab/6rVgZ0LQAnRiLZOJES+iprl+2PKGg8t4vzhZXSiOwyVpCIsWrVQXSDJiNuvenrih dWeDhgzSMp/Awvw+Vo7Q84KHGTn4vlQObioCXflm9P3wFy48If2MzGSoVPuTPlFNwBn7 BDGy3IKkH3lamLWfxtD1ICm1U8VFKrGaYi4phmYRNsTySm9b36PYYkjlEY9oZjU8fZTe gvj39VHfZmST9OzIjpbABQO+xT2anTeUmYUvHHzEYUIANg1zXqan+ZSJhuSYgDNRr/GX p7Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=JEMAlLL3NGuLqFLBWL9oqhqscgsFoPyEqTMfa3vc+S8=; b=WdspHh9ifQy94DPn4VTPM5Xdl39OnG1eVUU0nROhVmdM5MkpDILs+DjT9vyFg05Gdv FGKq5yt81s2zHCF9XLo/JIAFpNvKoggpegFd6WLt3DP501l/qf1LHHLSCu0geIbRP6yk L8uSoByJ7bx5V6QY0o3Yi/6hic6xf98Eq7LYbY6icDqCTgYAB0Jmynd+4VWgsegGWekK NVnkCHIdRk5Ub//GyMndstweyaCFOERXTXZfMWpWR1f3xZkGeSHgOsQr2/ncvQOm6VWF J1z+Iz6ETQOUOpqtmgi3OLl4vvQPH0CR9zhfWxMRkFidJt0VHhGIV4jCJQNNSaJ07MB4 6FFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Frkdx98C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c7-20020ac87dc7000000b00304b3db78basi5881108qte.29.2022.06.04.16.12.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Jun 2022 16:12:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Frkdx98C; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nxcwK-0008Nw-BT for patch@linaro.org; Sat, 04 Jun 2022 19:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxcv4-0008KT-2S for qemu-devel@nongnu.org; Sat, 04 Jun 2022 19:10:58 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:36541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nxcuw-0004zt-3L for qemu-devel@nongnu.org; Sat, 04 Jun 2022 19:10:56 -0400 Received: by mail-pj1-x102d.google.com with SMTP id u12-20020a17090a1d4c00b001df78c7c209so14919998pju.1 for ; Sat, 04 Jun 2022 16:10:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JEMAlLL3NGuLqFLBWL9oqhqscgsFoPyEqTMfa3vc+S8=; b=Frkdx98CZ1FcgCAuEcGM8FPan83brN4LI40wr4L98tOsknCXdceLM+a3M6FIxorhlV VQ0p7IICyQGHTrNKqKuUkgXfXeYzb0DEZLhguFNcBqvWLf9NwdS3xgrOtxtH5uWD/mXz UNJKRkpRYDxV6fgktP1DjD+29JA+wlsfd+Er0d915SRLACJF0hRCwrHJZeg0Y+ucYrru O0WZbrJHLiSbnvdUrzMNcH9lY27g7ScYfP+WhqSGl5yUQcIh4Dg5/Fv4b9lmWGZU603R NDs/xfKEPWSIWRpnMvXstoupVYeyZ/X6m2BEjKI+ZzOohDNVchcXAklJPKWFT2EAvL1s lEXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JEMAlLL3NGuLqFLBWL9oqhqscgsFoPyEqTMfa3vc+S8=; b=DI/fcSFP0qWkEBG4j3HpIFv21akbXQaFOUpLnsbyEzNJ3kJhjbo8fmQrVMGmVg2FvL z510Xm/qFOSmxVM3ZriHVldZaKoWEFSaF4DquGE0JBEDA6i6rAPDuAVakH50NR40zfRM N6fEWrWmeky5dabcVruGezH+Pq4p457yj9aoUrhPc6HVafj9eI6uDn+an8S3ej7zpygf 5EgeQbmWIgGHMN3zQ8B2y2Uzh2Cso8kH5jJRS74nJ+nnaSB4lsX7fC5Wb1IKvs4ztSkW 1iA0yc/0ctBr+eEU+HhN7B1xrPcZHWEm75P1rdzaYEHl6E4IUG8dwgudKQ+jzx0qYRPz N1jw== X-Gm-Message-State: AOAM532+3e3k1SDOD19CUkI/wOqsiCsb3T8VX3EeFDitTou3MDJgpqAR VrAFouuppCt8A9YIpAT5GgTfCIMLdKlvbg== X-Received: by 2002:a17:902:6505:b0:163:b040:829b with SMTP id b5-20020a170902650500b00163b040829bmr16631470plk.173.1654384208130; Sat, 04 Jun 2022 16:10:08 -0700 (PDT) Received: from bigtime.. ([2602:ae:1547:e101:250:b6ff:fe24:58ae]) by smtp.gmail.com with ESMTPSA id 184-20020a6302c1000000b003fcf1279c84sm5562151pgc.33.2022.06.04.16.10.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jun 2022 16:10:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/3] target/riscv: Minimize the calls to decode_save_opc Date: Sat, 4 Jun 2022 23:10:04 +0000 Message-Id: <20220604231004.49990-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220604231004.49990-1-richard.henderson@linaro.org> References: <20220604231004.49990-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.google.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The set of instructions that require decode_save_opc for unwinding is really fairly small -- only insns that can raise ILLEGAL_INSN at runtime. This includes CSR, anything that uses a *new* fp rounding mode, and many privileged insns. Since unwind info is stored as the difference from the previous insn, storing a 0 for most insns minimizes the size of the unwind info. Booting a debian kernel image to the missing rootfs panic yields - gen code size 22226819/1026886656 + gen code size 21601907/1026886656 on 41k TranslationBlocks, a savings of 610kB or a bit less than 3%. Signed-off-by: Richard Henderson Reviewed-by: Alistair Francis --- target/riscv/translate.c | 18 +++++++++--------- target/riscv/insn_trans/trans_privileged.c.inc | 4 ++++ target/riscv/insn_trans/trans_rvh.c.inc | 2 ++ target/riscv/insn_trans/trans_rvi.c.inc | 2 ++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 6e4bbea1cd..b328a7b2ff 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -204,6 +204,13 @@ static void gen_check_nanbox_s(TCGv_i64 out, TCGv_i64 in) tcg_gen_movcond_i64(TCG_COND_GEU, out, in, t_max, in, t_nan); } +static void decode_save_opc(DisasContext *ctx) +{ + assert(ctx->insn_start != NULL); + tcg_set_insn_start_param(ctx->insn_start, 1, ctx->opcode); + ctx->insn_start = NULL; +} + static void gen_set_pc_imm(DisasContext *ctx, target_ulong dest) { if (get_xl(ctx) == MXL_RV32) { @@ -633,6 +640,8 @@ static void gen_set_rm(DisasContext *ctx, int rm) return; } + /* The helper may raise ILLEGAL_INSN -- record binv for unwind. */ + decode_save_opc(ctx); gen_helper_set_rounding_mode(cpu_env, tcg_constant_i32(rm)); } @@ -1011,13 +1020,6 @@ static uint32_t opcode_at(DisasContextBase *dcbase, target_ulong pc) /* Include decoders for factored-out extensions */ #include "decode-XVentanaCondOps.c.inc" -static inline void decode_save_opc(DisasContext *ctx, target_ulong opc) -{ - assert(ctx->insn_start != NULL); - tcg_set_insn_start_param(ctx->insn_start, 1, opc); - ctx->insn_start = NULL; -} - static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) { /* @@ -1034,7 +1036,6 @@ static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) /* Check for compressed insn */ if (extract16(opcode, 0, 2) != 3) { - decode_save_opc(ctx, opcode); if (!has_ext(ctx, RVC)) { gen_exception_illegal(ctx); } else { @@ -1049,7 +1050,6 @@ static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opcode) opcode32 = deposit32(opcode32, 16, 16, translator_lduw(env, &ctx->base, ctx->base.pc_next + 2)); - decode_save_opc(ctx, opcode32); ctx->opcode = opcode32; ctx->pc_succ_insn = ctx->base.pc_next + 4; diff --git a/target/riscv/insn_trans/trans_privileged.c.inc b/target/riscv/insn_trans/trans_privileged.c.inc index 53613682e8..46f96ad74d 100644 --- a/target/riscv/insn_trans/trans_privileged.c.inc +++ b/target/riscv/insn_trans/trans_privileged.c.inc @@ -75,6 +75,7 @@ static bool trans_sret(DisasContext *ctx, arg_sret *a) { #ifndef CONFIG_USER_ONLY if (has_ext(ctx, RVS)) { + decode_save_opc(ctx); gen_helper_sret(cpu_pc, cpu_env); tcg_gen_exit_tb(NULL, 0); /* no chaining */ ctx->base.is_jmp = DISAS_NORETURN; @@ -90,6 +91,7 @@ static bool trans_sret(DisasContext *ctx, arg_sret *a) static bool trans_mret(DisasContext *ctx, arg_mret *a) { #ifndef CONFIG_USER_ONLY + decode_save_opc(ctx); gen_helper_mret(cpu_pc, cpu_env); tcg_gen_exit_tb(NULL, 0); /* no chaining */ ctx->base.is_jmp = DISAS_NORETURN; @@ -102,6 +104,7 @@ static bool trans_mret(DisasContext *ctx, arg_mret *a) static bool trans_wfi(DisasContext *ctx, arg_wfi *a) { #ifndef CONFIG_USER_ONLY + decode_save_opc(ctx); gen_set_pc_imm(ctx, ctx->pc_succ_insn); gen_helper_wfi(cpu_env); return true; @@ -113,6 +116,7 @@ static bool trans_wfi(DisasContext *ctx, arg_wfi *a) static bool trans_sfence_vma(DisasContext *ctx, arg_sfence_vma *a) { #ifndef CONFIG_USER_ONLY + decode_save_opc(ctx); gen_helper_tlb_flush(cpu_env); return true; #endif diff --git a/target/riscv/insn_trans/trans_rvh.c.inc b/target/riscv/insn_trans/trans_rvh.c.inc index cebcb3f8f6..4f8aecddc7 100644 --- a/target/riscv/insn_trans/trans_rvh.c.inc +++ b/target/riscv/insn_trans/trans_rvh.c.inc @@ -169,6 +169,7 @@ static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a) { REQUIRE_EXT(ctx, RVH); #ifndef CONFIG_USER_ONLY + decode_save_opc(ctx); gen_helper_hyp_gvma_tlb_flush(cpu_env); return true; #endif @@ -179,6 +180,7 @@ static bool trans_hfence_vvma(DisasContext *ctx, arg_sfence_vma *a) { REQUIRE_EXT(ctx, RVH); #ifndef CONFIG_USER_ONLY + decode_save_opc(ctx); gen_helper_hyp_tlb_flush(cpu_env); return true; #endif diff --git a/target/riscv/insn_trans/trans_rvi.c.inc b/target/riscv/insn_trans/trans_rvi.c.inc index f1342f30f8..cf17458022 100644 --- a/target/riscv/insn_trans/trans_rvi.c.inc +++ b/target/riscv/insn_trans/trans_rvi.c.inc @@ -822,6 +822,8 @@ static bool trans_fence_i(DisasContext *ctx, arg_fence_i *a) static bool do_csr_post(DisasContext *ctx) { + /* The helper may raise ILLEGAL_INSN -- record binv for unwind. */ + decode_save_opc(ctx); /* We may have changed important cpu state -- exit to main loop. */ gen_set_pc_imm(ctx, ctx->pc_succ_insn); tcg_gen_exit_tb(NULL, 0);