From patchwork Fri Dec 2 15:59:27 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: 86325 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp396189obb; Fri, 2 Dec 2016 08:02:36 -0800 (PST) X-Received: by 10.200.53.69 with SMTP id z5mr37829572qtb.64.1480694556479; Fri, 02 Dec 2016 08:02:36 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u7si3294164qka.142.2016.12.02.08.02.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Dec 2016 08:02:36 -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; dkim=fail header.i=@linaro.org; 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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCqIF-0004IS-9G for patch@linaro.org; Fri, 02 Dec 2016 11:02:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCqFW-0002we-RG for qemu-devel@nongnu.org; Fri, 02 Dec 2016 10:59:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCqFU-0004wN-EE for qemu-devel@nongnu.org; Fri, 02 Dec 2016 10:59:46 -0500 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:36790) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cCqFU-0004vu-8a for qemu-devel@nongnu.org; Fri, 02 Dec 2016 10:59:44 -0500 Received: by mail-wm0-x236.google.com with SMTP id g23so21064214wme.1 for ; Fri, 02 Dec 2016 07:59:44 -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-transfer-encoding; bh=jPS8CZuGEPvIN9sPKhxDKtMSH/jrb40IHpNjNBALWw4=; b=KXFfcJNFYoqKSRYIiKlMnNfjk70l8IyWK7ZCMCS7bhIQqTtD0RulMfO2oGDmh1UK4J Kftr7VonwKt8IbuBTQn/++VWWUah8rky46SgO6711UvCnXhAl0l7ScK+R1g0YbhONJwL +qzBprx837c0zVKon8uj/SU+ly1jsRnmwKST0= 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=jPS8CZuGEPvIN9sPKhxDKtMSH/jrb40IHpNjNBALWw4=; b=hrmtI0px7scuONQ5EIh3LIw7UEdAsU1DlseLorh66aAUZESk3mVhQ8zcoL5yPCgxcQ A8Bm5svGWM7r3A91U2jGUhuEmAXNn4TcEhHtjzNRn/RIy2F+ooXOfQRqjqwJ/9w0sHZ9 9QIG/m1tkiNuw/I6VUzDCRskZJjhRCel0V2Ge2aM0tc1a69KZwAtGwkiQLL7OEKe5a0A uZaFL32NPP3gzByGHC5YqerXZOKF8iHMIYB1CK8o31fyInBKERfo2mvZsyrlzcGppwn9 YQ5kqFwxBbVnKyqsczkWfzdV8mbMeJClKaAiAoHdo+9nX3XxN5sqBoMT6gTrK7WRT6gY RgwA== X-Gm-Message-State: AKaTC00ohhuvlWZHdCndWtoBlJ9+eDRL6ZI60n8Ba9TwR4Ii+KbFK1KSbeaMs/eO1KTvRu1r X-Received: by 10.28.143.20 with SMTP id r20mr3533043wmd.2.1480694383066; Fri, 02 Dec 2016 07:59:43 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l74sm3901063wmg.2.2016.12.02.07.59.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2016 07:59:40 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 53ECE3E026D; Fri, 2 Dec 2016 15:59:40 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 2 Dec 2016 15:59:27 +0000 Message-Id: <20161202155935.3130-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161202155935.3130-1-alex.bennee@linaro.org> References: <20161202155935.3130-1-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::236 Subject: [Qemu-devel] [RISU PATCH 1/9] risu: a bit more verbosity when running 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , joserz@linux.vnet.ibm.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Before this is could seem a little quite when running as you had no indication stuff was happening (or how fast). I only dump on the master side as I want to minimise the amount of qemu logs to sift through. Signed-off-by: Alex Bennée --- risu.c | 15 +++++++++++++-- risu.h | 3 +++ risu_aarch64.c | 3 +++ 3 files changed, 19 insertions(+), 2 deletions(-) -- 2.10.2 diff --git a/risu.c b/risu.c index 7e42160..756ca46 100644 --- a/risu.c +++ b/risu.c @@ -37,6 +37,16 @@ sigjmp_buf jmpbuf; /* Should we test for FP exception status bits? */ int test_fp_exc = 0; +long executed_tests = 0; +void report_test_status(void *pc) +{ + executed_tests += 1; + if (executed_tests % 100 == 0) { + fprintf(stderr,"Executed %ld test instructions (pc=%p)\r", + executed_tests, pc); + } +} + void master_sigill(int sig, siginfo_t *si, void *uc) { switch (recv_and_compare_register_info(master_socket, uc)) @@ -61,6 +71,7 @@ void apprentice_sigill(int sig, siginfo_t *si, void *uc) return; case 1: /* end of test */ + fprintf(stderr, "\nend of test\n"); exit(0); default: /* mismatch */ @@ -129,7 +140,7 @@ int master(int sock) } master_socket = sock; set_sigill_handler(&master_sigill); - fprintf(stderr, "starting image\n"); + fprintf(stderr, "starting master image at 0x%lx\n", image_start_address); image_start(); fprintf(stderr, "image returned unexpectedly\n"); exit(1); @@ -139,7 +150,7 @@ int apprentice(int sock) { apprentice_socket = sock; set_sigill_handler(&apprentice_sigill); - fprintf(stderr, "starting image\n"); + fprintf(stderr, "starting apprentice image at 0x%lx\n", image_start_address); image_start(); fprintf(stderr, "image returned unexpectedly\n"); exit(1); diff --git a/risu.h b/risu.h index 26ed834..e4bb323 100644 --- a/risu.h +++ b/risu.h @@ -26,6 +26,7 @@ extern uintptr_t image_start_address; extern void *memblock; extern int test_fp_exc; +extern int ismaster; /* Ops code under test can request from risu: */ #define OP_COMPARE 0 @@ -59,6 +60,8 @@ int recv_and_compare_register_info(int sock, void *uc); */ int report_match_status(void); +void report_test_status(void *pc); + /* Move the PC past this faulting insn by adjusting ucontext */ void advance_pc(void *uc); diff --git a/risu_aarch64.c b/risu_aarch64.c index 547f987..1595604 100644 --- a/risu_aarch64.c +++ b/risu_aarch64.c @@ -28,6 +28,9 @@ void advance_pc(void *vuc) { ucontext_t *uc = vuc; uc->uc_mcontext.pc += 4; + if (ismaster) { + report_test_status((void *) uc->uc_mcontext.pc); + } } static void set_x0(void *vuc, uint64_t x0)