From patchwork Tue Mar 15 14:30:21 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: 63876 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp703886lbc; Tue, 15 Mar 2016 07:34:12 -0700 (PDT) X-Received: by 10.140.94.69 with SMTP id f63mr38973691qge.0.1458052452428; Tue, 15 Mar 2016 07:34:12 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id t5si4943698qgt.117.2016.03.15.07.34.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 15 Mar 2016 07:34:12 -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; 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]:48610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afq31-0006KI-M3 for patch@linaro.org; Tue, 15 Mar 2016 10:34:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpze-00015i-NR for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afpzY-0005LZ-L1 for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:42 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:38228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afpzY-0005LN-At for qemu-devel@nongnu.org; Tue, 15 Mar 2016 10:30:36 -0400 Received: by mail-wm0-x22a.google.com with SMTP id l68so29326014wml.1 for ; Tue, 15 Mar 2016 07:30:36 -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=Kk9/VuDNAcwZWrNPGHkjOP12SAxGBlR8xhOxctnuOvQ=; b=WhBgkY9RoYaoX4z9mmlMxsd1SrNtMM6T+nsOAD6v6AstvUI47JeTAqkUrpppzTMMJb R4XRTqDJRI2Nj3OVC7TQ5keiUsd0aMQVl1jWDxjNd6E2BY9GI+TevcolrbQ1EiFzjOP4 paAK1yetT3u3Ae5pKCRWGj7QNJmyQk2MQWt6w= 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-transfer-encoding; bh=Kk9/VuDNAcwZWrNPGHkjOP12SAxGBlR8xhOxctnuOvQ=; b=ChZLHG/okD4ZXntrE7N8f0DUWp4GwORphjDeiLn1A4d4wTx5MuvwtWIoGoVrf2qAgD SVYZi2Iq+pIHyKXwHwD+YvRhi88BvcLvk/3hADcvLmvD0FfIdpfHo3ixBwlxP/98rQ9x 3fJtlauqASjNIfiMV2xToaG6T6FMhUcZII7ue7TMHa9WQ/o22ggo6wtj5tQERVCNi8tK fAgG512KUnl7yjg55x7EiQUPha0DMmcU0GYW+o+PI6NuxP+6NdUowLZCWyzD9y/OZMjK 1nZwSc09e0GeVZz9HIkp+fjK6q4vT3MRP58D2mRPH7KD4lV2kh9hMxTWvBx3Hqj4vXAM jD7g== X-Gm-Message-State: AD7BkJKiwvaZ+p0sxgD2sJezV8HyB3UD3IbJmbMR5QOcMbRZWeDAI+DrVvhZJsSXYkqQmCKa X-Received: by 10.194.134.134 with SMTP id pk6mr30866805wjb.176.1458052235804; Tue, 15 Mar 2016 07:30:35 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c144sm21151072wmd.12.2016.03.15.07.30.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2016 07:30:31 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E58AA3E04B3; Tue, 15 Mar 2016 14:30:27 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 15 Mar 2016 14:30:21 +0000 Message-Id: <1458052224-9316-8-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.2 In-Reply-To: <1458052224-9316-1-git-send-email-alex.bennee@linaro.org> References: <1458052224-9316-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::22a Cc: Peter Crosthwaite , crosthwaitepeter@gmail.com, pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v9 6/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 Reviewed-by: Richard Henderson ---- 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 v6 - minor merge conflict with earlier patch - add r-b tag --- 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.2 diff --git a/cpu-exec.c b/cpu-exec.c index 6206cdf..bbfcbfb 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -139,8 +139,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)) { @@ -171,10 +172,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, - "Stopped 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, + "Stopped 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 1d0222d..cf38adb 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -78,6 +78,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) + /* Maintenance: */ /* fflush() the log file */ diff --git a/tcg/tcg.c b/tcg/tcg.c index bbe3835..83fecb6 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2351,7 +2351,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"); @@ -2378,7 +2379,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 b3207fe..b4df1ec 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1137,7 +1137,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");