From patchwork Tue Oct 11 18:40:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Covington X-Patchwork-Id: 680861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3stm7m37VWz9s3T for ; Wed, 12 Oct 2016 05:42:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=codeaurora.org header.i=@codeaurora.org header.b=WAdn9Q6TmsKoo3MqdjBJmA06xPvC08zk2Wzm7z68BOCGAId9Vf+5HZuDE4viUmi+avPmWBwYCRsXmKNxbkBbs1tL0dk77wi1EwKhx541heCG2+M6OTzh50+bKhqlqORYD9gxUlMLfcKi37wEPj4kxPbkGmCtV8qpSouQaN1GHo0=; dkim=fail reason="signature verification failed" (1024-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b=WAdn9Q6TmsKoo3MqdjBJmA06xPvC08zk2Wzm7z68BOCGAId9Vf+5HZuDE4viUmi+avPmWBwYCRsXmKNxbkBbs1tL0dk77wi1EwKhx541heCG2+M6OTzh50+bKhqlqORYD9gxUlMLfcKi37wEPj4kxPbkGmCtV8qpSouQaN1GHo0=; dkim-atps=neutral Received: from localhost ([::1]:57416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bu20P-0008V8-5h for incoming@patchwork.ozlabs.org; Tue, 11 Oct 2016 14:42:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bu1z8-0007ae-Ra for qemu-devel@nongnu.org; Tue, 11 Oct 2016 14:41:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bu1z6-0003UN-CZ for qemu-devel@nongnu.org; Tue, 11 Oct 2016 14:41:05 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:56553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bu1z6-0003UA-1b for qemu-devel@nongnu.org; Tue, 11 Oct 2016 14:41:04 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 7283B61800; Tue, 11 Oct 2016 18:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1476211263; bh=HBWOrX0mZA/Ac4qJ1gkWr+4W20PksckHFmkmUJRfHqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WAdn9Q6TmsKoo3MqdjBJmA06xPvC08zk2Wzm7z68BOCGAId9Vf+5HZuDE4viUmi+a vPmWBwYCRsXmKNxbkBbs1tL0dk77wi1EwKhx541heCG2+M6OTzh50+bKhqlqORYD9g xUlMLfcKi37wEPj4kxPbkGmCtV8qpSouQaN1GHo0= Received: from rtp-lab-has1.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: cov@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 8449561707; Tue, 11 Oct 2016 18:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1476211263; bh=HBWOrX0mZA/Ac4qJ1gkWr+4W20PksckHFmkmUJRfHqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WAdn9Q6TmsKoo3MqdjBJmA06xPvC08zk2Wzm7z68BOCGAId9Vf+5HZuDE4viUmi+a vPmWBwYCRsXmKNxbkBbs1tL0dk77wi1EwKhx541heCG2+M6OTzh50+bKhqlqORYD9g xUlMLfcKi37wEPj4kxPbkGmCtV8qpSouQaN1GHo0= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 8449561707 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=cov@codeaurora.org From: Christopher Covington To: Andrew Jones , qemu-devel@nongnu.org Date: Tue, 11 Oct 2016 14:40:44 -0400 Message-Id: <20161011184044.28373-3-cov@codeaurora.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161011184044.28373-1-cov@codeaurora.org> References: <20161011184044.28373-1-cov@codeaurora.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 198.145.29.96 Subject: [Qemu-devel] [kvm-unit-tests PATCHv6 3/3] arm: pmu: Add CPI checking 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: Wei Huang , Christopher Covington Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Calculate the numbers of cycles per instruction (CPI) implied by ARM PMU cycle counter values. The code includes a strict checking facility intended for the -icount option in TCG mode but it is not yet enabled in the configuration file. Enabling it must wait on infrastructure improvements which allow for different tests to be run on TCG versus KVM. Signed-off-by: Christopher Covington --- arm/pmu.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/arm/pmu.c b/arm/pmu.c index 4334de4..788886a 100644 --- a/arm/pmu.c +++ b/arm/pmu.c @@ -43,6 +43,23 @@ static inline unsigned long get_pmccntr(void) asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (cycles)); return cycles; } + +/* + * Extra instructions inserted by the compiler would be difficult to compensate + * for, so hand assemble everything between, and including, the PMCR accesses + * to start and stop counting. + */ +static inline void loop(int i, uint32_t pmcr) +{ + asm volatile( + " mcr p15, 0, %[pmcr], c9, c12, 0\n" + "1: subs %[i], %[i], #1\n" + " bgt 1b\n" + " mcr p15, 0, %[z], c9, c12, 0\n" + : [i] "+r" (i) + : [pmcr] "r" (pmcr), [z] "r" (0) + : "cc"); +} #elif defined(__aarch64__) static inline uint32_t get_pmcr(void) { @@ -64,6 +81,23 @@ static inline unsigned long get_pmccntr(void) asm volatile("mrs %0, pmccntr_el0" : "=r" (cycles)); return cycles; } + +/* + * Extra instructions inserted by the compiler would be difficult to compensate + * for, so hand assemble everything between, and including, the PMCR accesses + * to start and stop counting. + */ +static inline void loop(int i, uint32_t pmcr) +{ + asm volatile( + " msr pmcr_el0, %[pmcr]\n" + "1: subs %[i], %[i], #1\n" + " b.gt 1b\n" + " msr pmcr_el0, xzr\n" + : [i] "+r" (i) + : [pmcr] "r" (pmcr) + : "cc"); +} #endif struct pmu_data { @@ -131,12 +165,79 @@ static bool check_cycles_increase(void) return true; } -int main(void) +/* + * Execute a known number of guest instructions. Only odd instruction counts + * greater than or equal to 3 are supported by the in-line assembly code. The + * control register (PMCR_EL0) is initialized with the provided value (allowing + * for example for the cycle counter or event counters to be reset). At the end + * of the exact instruction loop, zero is written to PMCR_EL0 to disable + * counting, allowing the cycle counter or event counters to be read at the + * leisure of the calling code. + */ +static void measure_instrs(int num, uint32_t pmcr) +{ + int i = (num - 1) / 2; + + assert(num >= 3 && ((num - 1) % 2 == 0)); + loop(i, pmcr); +} + +/* + * Measure cycle counts for various known instruction counts. Ensure that the + * cycle counter progresses (similar to check_cycles_increase() but with more + * instructions and using reset and stop controls). If supplied a positive, + * nonzero CPI parameter, also strictly check that every measurement matches + * it. Strict CPI checking is used to test -icount mode. + */ +static bool check_cpi(int cpi) +{ + struct pmu_data pmu = {0}; + + pmu.cycle_counter_reset = 1; + pmu.enable = 1; + + if (cpi > 0) + printf("Checking for CPI=%d.\n", cpi); + printf("instrs : cycles0 cycles1 ...\n"); + + for (int i = 3; i < 300; i += 32) { + int avg, sum = 0; + + printf("%d :", i); + for (int j = 0; j < NR_SAMPLES; j++) { + int cycles; + + measure_instrs(i, pmu.pmcr_el0); + cycles = get_pmccntr(); + printf(" %d", cycles); + + if (!cycles || (cpi > 0 && cycles != i * cpi)) { + printf("\n"); + return false; + } + + sum += cycles; + } + avg = sum / NR_SAMPLES; + printf(" sum=%d avg=%d avg_ipc=%d avg_cpi=%d\n", + sum, avg, i / avg, avg / i); + } + + return true; +} + +int main(int argc, char *argv[]) { + int cpi = 0; + + if (argc >= 1) + cpi = atol(argv[0]); + report_prefix_push("pmu"); report("Control register", check_pmcr()); report("Monotonically increasing cycle count", check_cycles_increase()); + report("Cycle/instruction ratio", check_cpi(cpi)); return report_summary(); }