From patchwork Wed Apr 25 23:45:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 904790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.b="S7CL285D"; dkim-atps=neutral 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 40WcdD65YPz9s0W for ; Thu, 26 Apr 2018 10:00:00 +1000 (AEST) Received: from localhost ([::1]:39608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBUKM-0006S9-Te for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2018 19:59:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBU9B-0005O1-9D for qemu-devel@nongnu.org; Wed, 25 Apr 2018 19:48:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBU9A-0005JR-8V for qemu-devel@nongnu.org; Wed, 25 Apr 2018 19:48:25 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:36955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fBU9A-0005J2-1u for qemu-devel@nongnu.org; Wed, 25 Apr 2018 19:48:24 -0400 Received: by mail-pf0-x242.google.com with SMTP id p6so16582911pfn.4 for ; Wed, 25 Apr 2018 16:48:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sXFscNsVNvuliK2lG76Ri3umPnh/ix6qjwnDeQAWcOM=; b=S7CL285DRd1mrjZDc7rjy6eIIZYCJ7SSCxRuzKoVYvV0Sf6LF31BJWVrGAfj7NsLNH oPARSnKEuRCF2uvKo59q43PA/m2j4/jCVW9+NTVJoZviGpLG7ExIOuTflJhcI1cqPNUB R6zKVWyUUX0f/cgSTA2MeSzq1m3TIxRIW+vUw3sYw/TDR9IU3UIM79mI3Lhs07H9ybo/ UVbpubph3ELgpBy3HF+Q4U12efIFNrzY7S2ahq3vqD8kJLuwTkm7vouSPSFNvgnHaSKy yRbopqDzjSW0r+BfOWkEW2jxAsH5idGkAiakNb/eYmZS35DD1UB8ZG1EIDxwxvTDoNJe UKbA== 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=sXFscNsVNvuliK2lG76Ri3umPnh/ix6qjwnDeQAWcOM=; b=BfGrVWrMkI78TDijvQ4alGuwf2OeJPsXdlpESMe/ll03MIT4LLAjGrudlOFrZVDVhy iZnLUT4iIv0yBJYmvAfNoQB+Qau6dyPD60xnvEZKZ+BS9PrSrT7zEzXO/JrlAvAL57rf mxg9DM5MGAZzGIwF/v6K7hIqC3iJeTjzcLk2+rRwudMnYM+Q1rDG51rOuS3EqiZ3byup 7g4LCVWM6vTiq+r8HWFBbNqI207Wjm4I5s2tHRCCrrhVrPVlSACFhdnTLPgnz9AOmbCP 4xUaNPERXVvh7GMwHncti7XxNi5AJpddvgwN5B9hViycVdzg869V1VxhCdx1I3SjBJhW Ivtw== X-Gm-Message-State: ALQs6tA5Pe02XdZgwWPHsvPZ4JXCom6AgQJOnQW+rOnn9grIBAvVHtnf ziURp1HDR4Yyjw/QDjrbKiLza+L2Ve4= X-Google-Smtp-Source: AIpwx4/XX9oSMMco+3ZEmlqQrqWFvpt0BPlzU8A1TCRpmBAoi6KIY091FlyQyukjJ7awRD51TxlfHQ== X-Received: by 10.101.100.214 with SMTP id t22mr20324944pgv.41.1524700103050; Wed, 25 Apr 2018 16:48:23 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id e10sm29577549pfn.67.2018.04.25.16.48.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Apr 2018 16:48:22 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Thu, 26 Apr 2018 11:45:24 +1200 Message-Id: <1524699938-6764-22-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1524699938-6764-1-git-send-email-mjc@sifive.com> References: <1524699938-6764-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v8 21/35] RISC-V: Add mcycle/minstret support for -icount auto 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: Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Michael Clark , Alistair Francis , patches@groups.riscv.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Previously the mycycle/minstret CSRs and rdcycle/rdinstret psuedo instructions would return the time as a proxy for an increasing instruction counter in the absence of having a precise instruction count. If QEMU is invoked with -icount, the mcycle/minstret CSRs and rdcycle/rdinstret psuedo instructions will return the instruction count. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis --- target/riscv/op_helper.c | 24 ++++++++++++++++++++---- target/riscv/translate.c | 2 ++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 2daf07c..7d3f1ee 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -433,25 +433,41 @@ target_ulong csr_read_helper(CPURISCVState *env, target_ulong csrno) case CSR_INSTRET: case CSR_CYCLE: if (ctr_ok) { - return cpu_get_host_ticks(); + if (use_icount) { + return cpu_get_icount(); + } else { + return cpu_get_host_ticks(); + } } break; #if defined(TARGET_RISCV32) case CSR_INSTRETH: case CSR_CYCLEH: if (ctr_ok) { - return cpu_get_host_ticks() >> 32; + if (use_icount) { + return cpu_get_icount() >> 32; + } else { + return cpu_get_host_ticks() >> 32; + } } break; #endif #ifndef CONFIG_USER_ONLY case CSR_MINSTRET: case CSR_MCYCLE: - return cpu_get_host_ticks(); + if (use_icount) { + return cpu_get_icount(); + } else { + return cpu_get_host_ticks(); + } case CSR_MINSTRETH: case CSR_MCYCLEH: #if defined(TARGET_RISCV32) - return cpu_get_host_ticks() >> 32; + if (use_icount) { + return cpu_get_icount() >> 32; + } else { + return cpu_get_host_ticks() >> 32; + } #endif break; case CSR_MUCOUNTEREN: diff --git a/target/riscv/translate.c b/target/riscv/translate.c index c3a029a..c0e6a04 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -1390,6 +1390,7 @@ static void gen_system(CPURISCVState *env, DisasContext *ctx, uint32_t opc, break; default: tcg_gen_movi_tl(imm_rs1, rs1); + gen_io_start(); switch (opc) { case OPC_RISC_CSRRW: gen_helper_csrrw(dest, cpu_env, source1, csr_store); @@ -1413,6 +1414,7 @@ static void gen_system(CPURISCVState *env, DisasContext *ctx, uint32_t opc, gen_exception_illegal(ctx); return; } + gen_io_end(); gen_set_gpr(rd, dest); /* end tb since we may be changing priv modes, to get mmu_index right */ tcg_gen_movi_tl(cpu_pc, ctx->next_pc);