From patchwork Wed May 23 00:14:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 136606 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp239184lji; Tue, 22 May 2018 17:24:58 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoB8bAKXRcxCeStvd4RbDGKMYFGGSZFCQkd/qZGcbt9TVsHFS1sISQsdGgjf24wFmXFZyQk X-Received: by 2002:a0c:d1f1:: with SMTP id k46-v6mr643783qvh.58.1527035098686; Tue, 22 May 2018 17:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527035098; cv=none; d=google.com; s=arc-20160816; b=H0ACKH8/khaXyae27HFPYGsyHJJI7IKkz70HKwN7PJtVCpTYNSNywO9E8rJYrSmRtT CVGzLcn0+OxnO7O+4cgSbclwMG4J8erG7mVS8suVJbYQpjje8Um7lQzVVhdT912e3LVC jz2FK9P2KCB4iZ21S6wxPd8v+lsM2lC2XawxPiJfOYx5Td4QGAicjQl5xpmnTeF7K+wu MCzNVUnNfP0t+6slp0fEtLkAGQxohyLMDMK8RPrUYvkDn5E/b90VUyNhwvawJlf+VO8G fPb2h3WQKGRe+3gt8irz86KP5dWJkNlAskStyCbHpkPPvrdb93lv9fsBUtS/iFP5umxN PYMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=UQTvZj72RaIvnmaEAk+BhrdskF46qoz6zEEFPApol3U=; b=gzrmbcnyETPuwC9G1fzCCE745QrCHUMOh3Ktgg+Bxsp368e9iCEHTsktppQvT6UnXF igyxS0ArJmodhsLdfraHGKClftb8v2fkc7AcEYQI0fb5mOemOuZNir0YjrKX2+ADF1e5 5Mccu4Ljl6Mz05wkEVciXdJ/btdctbkefyzXLS9Wnt4MzAnl7XgdHUAel5LHufqjn3YR YI354/ppyswPW9hQ3Jl2EUOpg0cDGXY/l71VTUE9VRW/T+WoGfgZ4tUMjTP4vZO7r8NC oxxeem7iO1dFkfAlHhKKJlQuyZMGBwDXPWHoOyGvsp1etFhwNcr7fd32Qj8lfvUibkOC Q16w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sifive.com header.s=google header.b=I5OSxy1y; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v54-v6si5946847qvc.39.2018.05.22.17.24.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 22 May 2018 17:24:58 -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; dkim=fail header.i=@sifive.com header.s=google header.b=I5OSxy1y; 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 Received: from localhost ([::1]:58528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLHaM-0004yv-48 for patch@linaro.org; Tue, 22 May 2018 20:24:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLHTA-0008FX-FB for qemu-devel@nongnu.org; Tue, 22 May 2018 20:17:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLHT9-0000rZ-01 for qemu-devel@nongnu.org; Tue, 22 May 2018 20:17:32 -0400 Received: from mail-pl0-x234.google.com ([2607:f8b0:400e:c01::234]:39816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLHT8-0000r0-O9 for qemu-devel@nongnu.org; Tue, 22 May 2018 20:17:30 -0400 Received: by mail-pl0-x234.google.com with SMTP id c19-v6so11868157pls.6 for ; Tue, 22 May 2018 17:17:30 -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=UQTvZj72RaIvnmaEAk+BhrdskF46qoz6zEEFPApol3U=; b=I5OSxy1y9yzKzNUcefk5krRgio76skgmLwnr666reLWAlFFCZvY98ePd2Ntf7JlCzA kRJkuYsAVxs29FFgnxNqorMkp6tgEVBI3gKq3LaGXUYYUF01U/jQ1NoQ6m0nyr6KhcHw rHKIqNWnXj+N8O95hq46XK42vq1baUPJJyl22VI/SmJAqtgcRRrpLC7eTf73lLfKnMCj qAVJHKF0j4oJdbaP54dX4y6F3Qhs/deTuuxxi6IUK0m0vr1TAeOC10RidGMqxU2W/NYg gctUmNwB6BR7CvhMEYqxf+Y8mwTj+2xRRuyPieZNUVCfQCpQMRePgPUrbqw2DktDVFeW 2P/Q== 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=UQTvZj72RaIvnmaEAk+BhrdskF46qoz6zEEFPApol3U=; b=fJ4EmNWUjjtsEOaeNVMWWRqNbzVjVTZfmLEOJO1h6CEjnKwpHkzl6Yr9CLv6XX+EXF cOvIWoaLUOWqwWIQmbVdIj1gaBsBwGHS1IRQJmvKgimuEZ1yL/P/cAJD8FKyeqQBVfqi fbULT4V1SpI0r6fb0448R7HE/R/tBQbLN9x8ObQR6rkusaLHGR5oK8X/LERXnoYNRcfa TOfFMQaK7e1E4fz/dZfGWMKZLEZDUCUsLUgp2fqb7R7Uo4pK/nLI4Q569c8/5YSYaNnC InzK9nOd8FseHQjCR7s/GmVYD1s9N/4dSWOAqPWa6KDyyGN3hIzu6SA57ombJgh2vi82 Ir7A== X-Gm-Message-State: ALKqPwf+r8qgL6W0093f8ZuYCJJIQUQscUrW6QQu7x+/c4gcGRmoNEav RFMvbbncISIGxYYC/1J0bbEjpsv7i5I= X-Received: by 2002:a17:902:be12:: with SMTP id r18-v6mr63506pls.102.1527034649796; Tue, 22 May 2018 17:17:29 -0700 (PDT) Received: from localhost.localdomain (122-58-167-22-fibre.bb.spark.co.nz. [122.58.167.22]) by smtp.gmail.com with ESMTPSA id j1-v6sm28935626pfh.95.2018.05.22.17.17.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 17:17:29 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Wed, 23 May 2018 12:14:59 +1200 Message-Id: <1527034517-7851-13-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1527034517-7851-1-git-send-email-mjc@sifive.com> References: <1527034517-7851-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:c01::234 Subject: [Qemu-devel] [PATCH v1 12/30] RISC-V: Mark mstatus.fs dirty 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 , Richard Henderson , Michael Clark , Alistair Francis , patches@groups.riscv.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Modifed from Richard Henderson's patch [1] to integrate with the new control and status register implementation. [1] https://lists.nongnu.org/archive/html/qemu-devel/2018-03/msg07034.html Note: the f* CSRs already mark mstatus.FS dirty using env->mstatus |= mstatus.FS so the bug in the first spin of this patch has been fixed in a prior commit. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Cc: Richard Henderson Signed-off-by: Michael Clark Reviewed-by: Michael Clark Co-authored-by: Richard Henderson Co-authored-by: Michael Clark --- target/riscv/csr.c | 12 ------------ target/riscv/translate.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 13 deletions(-) -- 2.7.0 Reviewed-by: Alistair Francis diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 0e6c0c365154..b4452388ff02 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -325,18 +325,6 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) mstatus = (mstatus & ~mask) | (val & mask); - /* Note: this is a workaround for an issue where mstatus.FS - does not report dirty after floating point operations - that modify floating point state. This workaround is - technically compliant with the RISC-V Privileged - specification as it is legal to return only off, or dirty. - at the expense of extra floating point save/restore. */ - - /* FP is always dirty or off */ - if (mstatus & MSTATUS_FS) { - mstatus |= MSTATUS_FS; - } - int dirty = ((mstatus & MSTATUS_FS) == MSTATUS_FS) | ((mstatus & MSTATUS_XS) == MSTATUS_XS); mstatus = set_field(mstatus, MSTATUS_SD, dirty); diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 466b9551cbd9..a980611eb611 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -651,6 +651,31 @@ static void gen_store(DisasContext *ctx, uint32_t opc, int rs1, int rs2, tcg_temp_free(dat); } +#ifndef CONFIG_USER_ONLY +/* The states of mstatus_fs are: + * 0 = disabled, 1 = initial, 2 = clean, 3 = dirty + * We will have already diagnosed disabled state, + * and need to turn initial/clean into dirty. + */ +static void mark_fs_dirty(DisasContext *ctx) +{ + TCGv tmp; + if (ctx->mstatus_fs == MSTATUS_FS) { + return; + } + /* Remember the state change for the rest of the TB. */ + ctx->mstatus_fs = MSTATUS_FS; + + tmp = tcg_temp_new(); + tcg_gen_ld_tl(tmp, cpu_env, offsetof(CPURISCVState, mstatus)); + tcg_gen_ori_tl(tmp, tmp, MSTATUS_FS); + tcg_gen_st_tl(tmp, cpu_env, offsetof(CPURISCVState, mstatus)); + tcg_temp_free(tmp); +} +#else +static inline void mark_fs_dirty(DisasContext *ctx) { } +#endif + static void gen_fp_load(DisasContext *ctx, uint32_t opc, int rd, int rs1, target_long imm) { @@ -679,6 +704,8 @@ static void gen_fp_load(DisasContext *ctx, uint32_t opc, int rd, break; } tcg_temp_free(t0); + + mark_fs_dirty(ctx); } static void gen_fp_store(DisasContext *ctx, uint32_t opc, int rs1, @@ -944,6 +971,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, int rs1, int rs2, int rm) { TCGv t0 = NULL; + bool fp_output = true; if (ctx->mstatus_fs == 0) { goto do_illegal; @@ -1006,6 +1034,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, } gen_set_gpr(rd, t0); tcg_temp_free(t0); + fp_output = false; break; case OPC_RISC_FCVT_W_S: @@ -1035,6 +1064,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, } gen_set_gpr(rd, t0); tcg_temp_free(t0); + fp_output = false; break; case OPC_RISC_FCVT_S_W: @@ -1085,6 +1115,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, } gen_set_gpr(rd, t0); tcg_temp_free(t0); + fp_output = false; break; case OPC_RISC_FMV_S_X: @@ -1177,6 +1208,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, } gen_set_gpr(rd, t0); tcg_temp_free(t0); + fp_output = false; break; case OPC_RISC_FCVT_W_D: @@ -1206,6 +1238,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, } gen_set_gpr(rd, t0); tcg_temp_free(t0); + fp_output = false; break; case OPC_RISC_FCVT_D_W: @@ -1253,6 +1286,7 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, default: goto do_illegal; } + fp_output = false; break; case OPC_RISC_FMV_D_X: @@ -1269,7 +1303,11 @@ static void gen_fp_arith(DisasContext *ctx, uint32_t opc, int rd, tcg_temp_free(t0); } gen_exception_illegal(ctx); - break; + return; + } + + if (fp_output) { + mark_fs_dirty(ctx); } }