From patchwork Mon Oct 16 17:25:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 115969 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3959251qgn; Mon, 16 Oct 2017 10:56:32 -0700 (PDT) X-Received: by 10.200.8.53 with SMTP id u50mr14920345qth.106.1508176592847; Mon, 16 Oct 2017 10:56:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508176592; cv=none; d=google.com; s=arc-20160816; b=tzq3RUZmYnAUB2CupUEVivO0bnRghUf0AO0NYM/hKKCGjTqCngNf333JFUQvGdOER4 +Dw09iSc0ImEiwXJPiLNQj4GPQnq2atjGdmrD9AhBrUtIFPUqiUPqLqZG+hQ9fQsbCrI Zww2TQP+DjfJdP8CG0WXDOo4DbZzg5moUSSICM5FFgYw8rgbiCkq7vZ1hmVcL9kxEtS2 eaWeMPo2yNXVF6I0SXsSptKzwIAxlDzS275wcuapyVgRb7XHpNTvSV1g3Ihow6AThdp9 7Y9BBWN4gXqMKZMXvxr3c3hFdHS8a4Ju+EIERm99C4366fviWQBw7/nUAhKWxPYig2Xx jqEw== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Vw/hp+C1d3vT3b7ZsD+YkxtyOWMep2FJT3usVPD/ybU=; b=kKrvv9WtSTZWYMjK5J5/SnRHqmh5M8mxTqFSheuzMMPDDkhV9VegjX5wWfzanVyZG/ qSDxV25prDeg8eq5c7JIFUJAWDF4yNYHTWYPzreU5+BRTyI/hYe/gdjMtzXlnwDwB2a/ g2IgAyaQfyrKdbOvpEBGsbFWXLDKNyN9rhoa1tQ1WCkVntPkn1zPIN3eJQ/YBpuKx4fB qQuF1UkXywPPUIprmWJqFrZS5xSwTDLaEijnp5VTKNv/eeCRL229QHn+K+okyAxvykU4 hcoBmRtfROoQBPYrbX7WEc3oyM8s0piXLnzpiGgM//cwfMdTMIpFQMssxMBtHTxbKgSu RlJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z6JFuhqM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l187si3072711qkc.277.2017.10.16.10.56.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Oct 2017 10:56:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Z6JFuhqM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:34421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49cs-0002Lq-NK for patch@linaro.org; Mon, 16 Oct 2017 13:56:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e49AR-0002hw-Mz for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e49AQ-0003rt-Gd for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:27:07 -0400 Received: from mail-pf0-x236.google.com ([2607:f8b0:400e:c00::236]:44288) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e49AQ-0003rI-A2 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 13:27:06 -0400 Received: by mail-pf0-x236.google.com with SMTP id x7so16318020pfa.1 for ; Mon, 16 Oct 2017 10:27:06 -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; bh=Vw/hp+C1d3vT3b7ZsD+YkxtyOWMep2FJT3usVPD/ybU=; b=Z6JFuhqMt+qpc9rxSanHrM2nQa0s1p+Vaj0ZM0ZA5uE+wlhzVh1NT1PxCVzsCs1iay aVJK77uOqHoj7rMh8A1/FQqXDkSdkv3XG0Mrp7Q6lSrSGiXPwjHCVJy3637cZqAOuwYw bEd6qSo0K87sqA4PajUyNAitTAGVxCn5yVrOY= 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; bh=Vw/hp+C1d3vT3b7ZsD+YkxtyOWMep2FJT3usVPD/ybU=; b=NeW5I7JZiZFbE/OdCo7NiO5nDbnzxGaUdG3ooz3LKsWelhPlK7iFXwlgBlPmj5KEpL Syepv0EZgQuFFkg0fuBJDAoBvGcRd70TWzTszjW4MkEZLyQevSqeEHoBD1/HQrNyIqrS Its1bseGinu55aDCkVgss2mvsFjBOmdeYi1lB78qUx/XxL2NiNma+6OZxRSD5kdNUE6n WH9hM4mDSiKXMmoaVaYj0v9thPs0i1fqgL9FNyTExTvQQe4am15JE0K2VThi3yLBLclw Gf9nB317CuM6fNC+xLQNQu3dcOx7+ZAoL2chv07icu3UWE6MTZuDWI9Y36FhUk/9FS11 gcSg== X-Gm-Message-State: AMCzsaXRo2uW6beVdefRbGZlxSljJnC92FgdQ5Nrk2JRxL9GqvSC2fAU RLXSC29oP4BRK6UBSgdvKVA+kunJ1z0= X-Google-Smtp-Source: AOwi7QAPcU2fSe69dQDidCb1GYO2K2T1k9cVIxoUhAzKwaCRItzRY33flgGh1uRIe3I4k+t2FNoHYw== X-Received: by 10.98.75.221 with SMTP id d90mr9496235pfj.90.1508174825070; Mon, 16 Oct 2017 10:27:05 -0700 (PDT) Received: from cloudburst.twiddle.net (97-126-104-76.tukw.qwest.net. [97.126.104.76]) by smtp.gmail.com with ESMTPSA id i187sm5594249pfc.96.2017.10.16.10.27.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Oct 2017 10:27:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 10:25:56 -0700 Message-Id: <20171016172609.23422-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171016172609.23422-1-richard.henderson@linaro.org> References: <20171016172609.23422-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::236 Subject: [Qemu-devel] [PATCH v6 37/50] tcg: Remove CF_IGNORE_ICOUNT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cota@braap.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that we have curr_cflags, we can include CF_USE_ICOUNT early and then remove it as necessary. Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 17 +++++++++-------- accel/tcg/cpu-exec.c | 16 +++++++++------- accel/tcg/translate-all.c | 3 --- 3 files changed, 18 insertions(+), 18 deletions(-) -- 2.13.6 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index a3bd3e7abd..f14c6a56eb 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -22,6 +22,7 @@ #include "qemu-common.h" #include "exec/tb-context.h" +#include "sysemu/cpus.h" /* allow to see translation results - the slowdown should be negligible, so we leave it */ #define DEBUG_DISAS @@ -319,13 +320,12 @@ struct TranslationBlock { size <= TARGET_PAGE_SIZE) */ uint16_t icount; uint32_t cflags; /* compile flags */ -#define CF_COUNT_MASK 0x7fff -#define CF_LAST_IO 0x8000 /* Last insn may be an IO access. */ -#define CF_NOCACHE 0x10000 /* To be freed after execution */ -#define CF_USE_ICOUNT 0x20000 -#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */ -#define CF_INVALID 0x80000 /* TB is stale. Setters must acquire tb_lock */ -#define CF_PARALLEL 0x100000 /* Generate code for a parallel context */ +#define CF_COUNT_MASK 0x00007fff +#define CF_LAST_IO 0x00008000 /* Last insn may be an IO access. */ +#define CF_NOCACHE 0x00010000 /* To be freed after execution */ +#define CF_USE_ICOUNT 0x00020000 +#define CF_INVALID 0x00040000 /* TB is stale. Setters need tb_lock */ +#define CF_PARALLEL 0x00080000 /* Generate code for a parallel context */ /* cflags' mask for hashing/comparison */ #define CF_HASH_MASK \ (CF_COUNT_MASK | CF_LAST_IO | CF_USE_ICOUNT | CF_PARALLEL) @@ -380,7 +380,8 @@ static inline uint32_t tb_cflags(const TranslationBlock *tb) /* current cflags for hashing/comparison */ static inline uint32_t curr_cflags(void) { - return parallel_cpus ? CF_PARALLEL : 0; + return (parallel_cpus ? CF_PARALLEL : 0) + | (use_icount ? CF_USE_ICOUNT : 0); } void tb_free(TranslationBlock *tb); diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 0eecbccebc..59fd784436 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -198,17 +198,19 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles, TranslationBlock *orig_tb, bool ignore_icount) { TranslationBlock *tb; + uint32_t cflags = curr_cflags() | CF_NOCACHE; + + if (ignore_icount) { + cflags &= ~CF_USE_ICOUNT; + } /* Should never happen. We only end up here when an existing TB is too long. */ - if (max_cycles > CF_COUNT_MASK) - max_cycles = CF_COUNT_MASK; + cflags |= MIN(max_cycles, CF_COUNT_MASK); tb_lock(); - tb = tb_gen_code(cpu, orig_tb->pc, orig_tb->cs_base, orig_tb->flags, - max_cycles | CF_NOCACHE - | (ignore_icount ? CF_IGNORE_ICOUNT : 0) - | curr_cflags()); + tb = tb_gen_code(cpu, orig_tb->pc, orig_tb->cs_base, + orig_tb->flags, cflags); tb->orig_tb = orig_tb; tb_unlock(); @@ -229,7 +231,7 @@ void cpu_exec_step_atomic(CPUState *cpu) TranslationBlock *tb; target_ulong cs_base, pc; uint32_t flags; - uint32_t cflags = 1 | CF_IGNORE_ICOUNT; + uint32_t cflags = 1; uint32_t cf_mask = cflags & CF_HASH_MASK; if (sigsetjmp(cpu->jmp_env, 0) == 0) { diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index d3dee985b4..d6b3bc0a38 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1274,9 +1274,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, assert_memory_lock(); phys_pc = get_page_addr_code(env, pc); - if (use_icount && !(cflags & CF_IGNORE_ICOUNT)) { - cflags |= CF_USE_ICOUNT; - } tb = tb_alloc(pc); if (unlikely(!tb)) {