From patchwork Thu Feb 4 14:56:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 61195 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp506710lbl; Thu, 4 Feb 2016 07:01:08 -0800 (PST) X-Received: by 10.140.128.8 with SMTP id 8mr9718370qha.54.1454598062840; Thu, 04 Feb 2016 07:01:02 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n76si10973655qkl.12.2016.02.04.07.01.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 04 Feb 2016 07:01:02 -0800 (PST) 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; 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; dkim=fail header.i=@linaro.org Received: from localhost ([::1]:42245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRLP4-00088E-Cx for patch@linaro.org; Thu, 04 Feb 2016 10:01:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRLKx-0001sy-Jx for qemu-devel@nongnu.org; Thu, 04 Feb 2016 09:56:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRLKr-0001To-9b for qemu-devel@nongnu.org; Thu, 04 Feb 2016 09:56:47 -0500 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:36993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRLKr-0001TV-08 for qemu-devel@nongnu.org; Thu, 04 Feb 2016 09:56:41 -0500 Received: by mail-wm0-x234.google.com with SMTP id g62so8274824wme.0 for ; Thu, 04 Feb 2016 06:56:40 -0800 (PST) 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-type:content-transfer-encoding; bh=c16dY1AFOJPMGu46HRRYEJQ15mPilZT8+vD8CMjJ6oA=; b=LdHqwgRUY45ER/X+UmcW4UoYA9bG/7zCLZAUgAePAO+1/dnC8mo97+6rw21gMkCfZX LszXJnifjhtK/BODG4Q5wIcFVgbzBEq9GbfoTh59Y08DceDNnN6RZ4kwLb9hjs8YvwoJ PK7SPGI6EK+UyUGIGB3kD+TJ4+UEtEGgJLH0Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=c16dY1AFOJPMGu46HRRYEJQ15mPilZT8+vD8CMjJ6oA=; b=faTd7LPcZao1zfD6CakV5bYQKZwqIAN/9zScaECRXc46ruRO0E4ZEfzpqm43zh5T9Y 2cFY/Ms0XMx/W4yeXdKYjTq+fatt4pUcij0e1ppbeOt87ZTgth1lhWRlzwXkHTBGaGSh 8IJqOD7pNiX/x67ejknlFnd8yCYKlVeK9ZUuSj9F4+sL2ZtlmgkE3rurVJXgjkRue3ra Acz4oXWkNVF+unJ9vF1+khjoM6BCs+SEVfeI74HM8Pscmp0da7IfsGlgF4fVesbCxAby hHAifrvfrfbGER1vLqzU80EdMfDgmb4fAjKFY1ntDyhHbruX2rNzxvwOW/ZL9Evq7mSd ofqA== X-Gm-Message-State: AG10YOTDOUNA9LlmXGUaOlXqiG0OzigUySNbg86ztUzawJMk1CDyUKd1/bfVKgIZBIYhy95I X-Received: by 10.194.250.39 with SMTP id yz7mr9560093wjc.92.1454597800255; Thu, 04 Feb 2016 06:56:40 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s2sm10825300wjs.39.2016.02.04.06.56.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2016 06:56:37 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 193793E07AF; Thu, 4 Feb 2016 14:56:30 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 4 Feb 2016 14:56:19 +0000 Message-Id: <1454597781-18115-8-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454597781-18115-1-git-send-email-alex.bennee@linaro.org> References: <1454597781-18115-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::234 Cc: peter.maydell@linaro.org, Peter Crosthwaite , dgilbert@redhat.com, crosthwaitepeter@gmail.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v5 7/9] qemu-log: dfilter-ise exec, out_asm, op and opt_op X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+patch=linaro.org@nongnu.org This ensures the code generation debug code will honour -dfilter if set. For the "exec" tracing I've added a new inline macro for efficiency's sake. Signed-off-by: Alex Bennée Reviewed-by: Aurelien Jarno ---- v2 - checkpatch updates - add qemu_log_mask_and_addr macro for inline dump for traces - re-base on re-factored tcg layout - include new Trace & Link lines v5 - add r-b tag - slight reword to commit now LOG_OP is common --- cpu-exec.c | 13 +++++++------ include/exec/exec-all.h | 8 +++++--- include/qemu/log.h | 15 +++++++++++++++ tcg/tcg.c | 6 ++++-- translate-all.c | 3 ++- 5 files changed, 33 insertions(+), 12 deletions(-) -- 2.7.0 diff --git a/cpu-exec.c b/cpu-exec.c index 8151e6f..d6fb033 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -138,8 +138,9 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) uintptr_t next_tb; uint8_t *tb_ptr = itb->tc_ptr; - qemu_log_mask(CPU_LOG_EXEC, "Trace %p [" TARGET_FMT_lx "] %s\n", - itb->tc_ptr, itb->pc, lookup_symbol(itb->pc)); + qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc, + "Trace %p [" TARGET_FMT_lx "] %s\n", + itb->tc_ptr, itb->pc, lookup_symbol(itb->pc)); #if defined(DEBUG_DISAS) if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { @@ -170,10 +171,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) */ CPUClass *cc = CPU_GET_CLASS(cpu); TranslationBlock *tb = (TranslationBlock *)(next_tb & ~TB_EXIT_MASK); - qemu_log_mask(CPU_LOG_EXEC, - "Abandoned execution of TB chain before %p [" - TARGET_FMT_lx "] %s\n", - itb->tc_ptr, itb->pc, lookup_symbol(itb->pc)); + qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc, + "Abandoned execution of TB chain before %p [" + TARGET_FMT_lx "] %s\n", + itb->tc_ptr, itb->pc, lookup_symbol(itb->pc)); if (cc->synchronize_from_tb) { cc->synchronize_from_tb(cpu, tb); } else { diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 1823ee3..7362095 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -379,9 +379,11 @@ static inline void tb_add_jump(TranslationBlock *tb, int n, { /* NOTE: this test is only needed for thread safety */ if (!tb->jmp_next[n]) { - qemu_log_mask(CPU_LOG_EXEC, "Linking TBs %p [" TARGET_FMT_lx - "] index %d -> %p [" TARGET_FMT_lx "]\n", - tb->tc_ptr, tb->pc, n, tb_next->tc_ptr, tb_next->pc); + qemu_log_mask_and_addr(CPU_LOG_EXEC, tb->pc, + "Linking TBs %p [" TARGET_FMT_lx + "] index %d -> %p [" TARGET_FMT_lx "]\n", + tb->tc_ptr, tb->pc, n, + tb_next->tc_ptr, tb_next->pc); /* patch the native jump address */ tb_set_jmp_target(tb, n, (uintptr_t)tb_next->tc_ptr); diff --git a/include/qemu/log.h b/include/qemu/log.h index 34a8fe6..de9ec7f 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -85,6 +85,21 @@ qemu_log_vprintf(const char *fmt, va_list va) } \ } while (0) +/* log only if a bit is set on the current loglevel mask + * and we are in the address range we care about: + * @mask: bit to check in the mask + * @addr: address to check in dfilter + * @fmt: printf-style format string + * @args: optional arguments for format string + */ +#define qemu_log_mask_and_addr(MASK, ADDR, FMT, ...) \ + do { \ + if (unlikely(qemu_loglevel_mask(MASK)) && \ + qemu_log_in_addr_range(ADDR)) { \ + qemu_log(FMT, ## __VA_ARGS__); \ + } \ + } while (0) + /* Special cases: */ /* cpu_dump_state() logging functions: */ diff --git a/tcg/tcg.c b/tcg/tcg.c index 0101cc1..ad697cf 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2339,7 +2339,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #endif #ifdef DEBUG_DISAS - if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP))) { + if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP) + && qemu_log_in_addr_range(tb->pc))) { qemu_log("OP:\n"); tcg_dump_ops(s); qemu_log("\n"); @@ -2366,7 +2367,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) #endif #ifdef DEBUG_DISAS - if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT))) { + if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT) + && qemu_log_in_addr_range(tb->pc))) { qemu_log("OP after optimization and liveness analysis:\n"); tcg_dump_ops(s); qemu_log("\n"); diff --git a/translate-all.c b/translate-all.c index dce00d5..37003a7 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1134,7 +1134,8 @@ TranslationBlock *tb_gen_code(CPUState *cpu, #endif #ifdef DEBUG_DISAS - if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) { + if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM) && + qemu_log_in_addr_range(tb->pc)) { qemu_log("OUT: [size=%d]\n", gen_code_size); log_disas(tb->tc_ptr, gen_code_size); qemu_log("\n");