From patchwork Wed Jul 21 19:59:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 483336 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp6525356jao; Wed, 21 Jul 2021 13:14:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9z2g/MhEkrwZsKEy6RY05IV4RmqM66lmAzOqfg+Mul5TR3wcHuw91E7TFhtVRq5SYqq4z X-Received: by 2002:a05:620a:f03:: with SMTP id v3mr36975152qkl.96.1626898497935; Wed, 21 Jul 2021 13:14:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626898497; cv=none; d=google.com; s=arc-20160816; b=vhxqhXYERs/4ODn+IkudAwvl24RD84cASGM7gGD87BZtDR0Y+HRvXIe+uuP34931nL 4irmi1sH/HoxG3lOxFM5FrnbKdheifFXUKHre7d+r1Jm6zo0p8pU1+uisKyUpStdcFik 8Iwhu7J2WzxFHj5xZg9CB41hKH/XGUyUhcR8/nd4iVWS6nZDwXW2xDZGSPsYgEQyotue t2RdkLLQvGAlRKD8qNqIN8ic65ES6KzuIu3Cy8zB4Dl3p2AJ/5ftjzQeLoK7uE5TK3Tp WDUHKBiDKvE3SKn90afZg/VdtoMfcnCC9oe4N+6qWz+go8IdJm1fZtQloN1H3CVez/Bd v3xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=qpFwoKbq+TluVfp0et24W5UD/m+YrCl4U/myz3fWvpI=; b=MrlKU1t9RDP1EPC7k4dziT20Mm82WlA1BlHA44lq7HMqc0hdSmAOzRtcXCVATw7iAd WfwuzDxkWY4Krx9Mddy3H478/GxLg3EjrHBrBpi1bZV+YugSsIGbGqCnJ5Sa9eYXt87M lOOkidTrAOEWY+kMGQ/IagV1uYyn6bt1firYGri7d/BLW4M7hoi2p6bhitJR4/833kIM hIFQnPi4+YhcoHIfw6Z4Z1JEv+kmoLk1FNiq6ea2R/MXKN4NdPKFGpEp/lOLOROPGr/W 7r81/4wd3SC3d9oMlaIhU9uaOpxecWeSyvjiMg21uI3Rhp+3XKHKkORh3Ah9yapCZlpp fQDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=mYqVBJrw; 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=fail (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 dv3si20351204qvb.199.2021.07.21.13.14.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jul 2021 13:14:57 -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=fail header.i=@linaro.org header.s=google header.b=mYqVBJrw; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6IcL-0006Al-8w for patch@linaro.org; Wed, 21 Jul 2021 16:14:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6IOF-0002uX-Vw for qemu-devel@nongnu.org; Wed, 21 Jul 2021 16:00:24 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:40845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6IO9-0005nd-Uv for qemu-devel@nongnu.org; Wed, 21 Jul 2021 16:00:22 -0400 Received: by mail-pl1-x62e.google.com with SMTP id q13so720759plx.7 for ; Wed, 21 Jul 2021 13:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qpFwoKbq+TluVfp0et24W5UD/m+YrCl4U/myz3fWvpI=; b=mYqVBJrwBAbnZk0USsdPBlGRHPBJeKe2+OYpaZzN2zLQUUvRWklhpYwfhcS4OdWJqS oe+hfU9JTpUSSDnvjrQOa8RV2NLRvjNB09ey9couUpICgbx2v/zOSdOFQb7OMMYUDXlo rvkx+qvDvDQZ6ux7Va29kFvn10x6Daq6MXwqY33F3w5FhobnDhOStwIf5IxKJC2PS69q HQiJZ8d4jVECAwvwx28QdSNNjDGIJT3TpQBdWOafMBc9v7EVA05It7kAUBGzKvGUe+qG nCke4QdRUiL24SZkgq5vBYcdFs3OyWue5TzQPC7Yjhc3wc435ul4ExpmoxuMIvvh24Vf SJdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qpFwoKbq+TluVfp0et24W5UD/m+YrCl4U/myz3fWvpI=; b=SKzXyuZJVXqrBbKY8tg/rde9BfCKBbt6YNbSyiX/Mi55VwiUoFiODDBlbsXzWN037i WCw2ES81EAlZseqOr4M/vyA+k5hQJVE+vxvqqVv6JvA/fB0XY+Zx4bK5dKLSOLGPLTpH sj8mAXDKK8VwNh2Mzg8Ix4Vau48d2NLVoYR/2LRhILoVMjTJ8+wy5fyjOlR0XR+AHJT/ kRHGUnmypRh1GpNrlLPl7BYxy7FvOgT1BMJb1aSxebcrNUsWzTJNePSQcfpnEKR1GORR 4BAE8KNEGp18qlwHZyPfSrAWrJMbYihlerK3Eq5R9xFxh6qfjm4xvaP7aHRhPj38P6KO mRJQ== X-Gm-Message-State: AOAM531n4zDdCsLsZD580SavOD0twIAsECZZ8bmgjrrvhGB93UvnZMcH V1czKdX4S1JBysnmLkcKkzlMxmYCYmEWyw== X-Received: by 2002:a65:62da:: with SMTP id m26mr37518325pgv.370.1626897616412; Wed, 21 Jul 2021 13:00:16 -0700 (PDT) Received: from localhost.localdomain (204-210-126-223.res.spectrum.com. [204.210.126.223]) by smtp.gmail.com with ESMTPSA id w3sm706028pjq.12.2021.07.21.13.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 13:00:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 14/27] accel/tcg: Add CF_NO_GOTO_TB and CF_NO_GOTO_PTR Date: Wed, 21 Jul 2021 09:59:41 -1000 Message-Id: <20210721195954.879535-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210721195954.879535-1-richard.henderson@linaro.org> References: <20210721195954.879535-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , peter.maydell@linaro.org, Mark Cave-Ayland Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Move the -d nochain check to bits on tb->cflags. These will be used for more than -d nochain shortly. Set bits during curr_cflags, test them in translator_use_goto_tb, assert we're not doing anything odd in tcg_gen_goto_tb. The test in tcg_gen_exit_tb is redundant with the assert for goto_tb_issue_mask. Tested-by: Mark Cave-Ayland Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Reviewed-by: Peter Maydell Message-Id: <20210717221851.2124573-4-richard.henderson@linaro.org> --- include/exec/exec-all.h | 16 +++++++++------- accel/tcg/cpu-exec.c | 8 +++++++- accel/tcg/translator.c | 5 +++++ tcg/tcg-op.c | 28 ++++++++++++---------------- 4 files changed, 33 insertions(+), 24 deletions(-) -- 2.25.1 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index ae7603ca75..6873cce8df 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -494,13 +494,15 @@ struct TranslationBlock { uint32_t cflags; /* compile flags */ /* Note that TCG_MAX_INSNS is 512; we validate this match elsewhere. */ -#define CF_COUNT_MASK 0x000001ff -#define CF_LAST_IO 0x00008000 /* Last insn may be an IO access. */ -#define CF_MEMI_ONLY 0x00010000 /* Only instrument memory ops */ -#define CF_USE_ICOUNT 0x00020000 -#define CF_INVALID 0x00040000 /* TB is stale. Set with @jmp_lock held */ -#define CF_PARALLEL 0x00080000 /* Generate code for a parallel context */ -#define CF_CLUSTER_MASK 0xff000000 /* Top 8 bits are cluster ID */ +#define CF_COUNT_MASK 0x000001ff +#define CF_NO_GOTO_TB 0x00000200 /* Do not chain with goto_tb */ +#define CF_NO_GOTO_PTR 0x00000400 /* Do not chain with goto_ptr */ +#define CF_LAST_IO 0x00008000 /* Last insn may be an IO access. */ +#define CF_MEMI_ONLY 0x00010000 /* Only instrument memory ops */ +#define CF_USE_ICOUNT 0x00020000 +#define CF_INVALID 0x00040000 /* TB is stale. Set with @jmp_lock held */ +#define CF_PARALLEL 0x00080000 /* Generate code for a parallel context */ +#define CF_CLUSTER_MASK 0xff000000 /* Top 8 bits are cluster ID */ #define CF_CLUSTER_SHIFT 24 /* Per-vCPU dynamic tracing state used to generate this TB */ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index ef4214d893..d3232d5764 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -147,7 +147,13 @@ static void init_delay_params(SyncClocks *sc, const CPUState *cpu) uint32_t curr_cflags(CPUState *cpu) { - return cpu->tcg_cflags; + uint32_t cflags = cpu->tcg_cflags; + + if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { + cflags |= CF_NO_GOTO_TB | CF_NO_GOTO_PTR; + } + + return cflags; } /* Might cause an exception, so have a longjmp destination ready */ diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 59804af37b..2ea5a74f30 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -33,6 +33,11 @@ void translator_loop_temp_check(DisasContextBase *db) bool translator_use_goto_tb(DisasContextBase *db, target_ulong dest) { + /* Suppress goto_tb if requested. */ + if (tb_cflags(db->tb) & CF_NO_GOTO_TB) { + return false; + } + /* Suppress goto_tb in the case of single-steping. */ if (db->singlestep_enabled || singlestep) { return false; diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 75eaa910c9..c754396575 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2723,10 +2723,6 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx) seen this numbered exit before, via tcg_gen_goto_tb. */ tcg_debug_assert(tcg_ctx->goto_tb_issue_mask & (1 << idx)); #endif - /* When not chaining, exit without indicating a link. */ - if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { - val = 0; - } } else { /* This is an exit via the exitreq label. */ tcg_debug_assert(idx == TB_EXIT_REQUESTED); @@ -2738,6 +2734,8 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx) void tcg_gen_goto_tb(unsigned idx) { + /* We tested CF_NO_GOTO_TB in translator_use_goto_tb. */ + tcg_debug_assert(!(tcg_ctx->tb_cflags & CF_NO_GOTO_TB)); /* We only support two chained exits. */ tcg_debug_assert(idx <= TB_EXIT_IDXMAX); #ifdef CONFIG_DEBUG_TCG @@ -2746,25 +2744,23 @@ void tcg_gen_goto_tb(unsigned idx) tcg_ctx->goto_tb_issue_mask |= 1 << idx; #endif plugin_gen_disable_mem_helpers(); - /* When not chaining, we simply fall through to the "fallback" exit. */ - if (!qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { - tcg_gen_op1i(INDEX_op_goto_tb, idx); - } + tcg_gen_op1i(INDEX_op_goto_tb, idx); } void tcg_gen_lookup_and_goto_ptr(void) { - if (!qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { - TCGv_ptr ptr; + TCGv_ptr ptr; - plugin_gen_disable_mem_helpers(); - ptr = tcg_temp_new_ptr(); - gen_helper_lookup_tb_ptr(ptr, cpu_env); - tcg_gen_op1i(INDEX_op_goto_ptr, tcgv_ptr_arg(ptr)); - tcg_temp_free_ptr(ptr); - } else { + if (tcg_ctx->tb_cflags & CF_NO_GOTO_PTR) { tcg_gen_exit_tb(NULL, 0); + return; } + + plugin_gen_disable_mem_helpers(); + ptr = tcg_temp_new_ptr(); + gen_helper_lookup_tb_ptr(ptr, cpu_env); + tcg_gen_op1i(INDEX_op_goto_ptr, tcgv_ptr_arg(ptr)); + tcg_temp_free_ptr(ptr); } static inline MemOp tcg_canonicalize_memop(MemOp op, bool is64, bool st)