summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@sifive.com>2018-11-09 10:56:50 -0800
committerPalmer Dabbelt <palmer@sifive.com>2018-11-13 15:12:15 -0800
commit3502dc824a7b0218abb49f4350e80a49829748cf (patch)
treec057e6b64222647cda9235f5c59a3cc86b12d2c6
parent657377730647c2156f1e20087e28129dc32e1242 (diff)
downloadfocaccia-qemu-3502dc824a7b0218abb49f4350e80a49829748cf.tar.gz
focaccia-qemu-3502dc824a7b0218abb49f4350e80a49829748cf.zip
RISC-V: Respect fences for user-only emulators
Our current fence implementation ignores fences for the user-only
configurations.  This is incorrect but unlikely to manifest: it requires
multi-threaded user-only code that takes advantage of the weakness in
the host's memory model and can be inlined by TCG.

This patch simply treats fences the same way for all our emulators.
I've given it to testing as I don't want to construct a test that would
actually trigger the failure.

Our fence implementation has an additional deficiency where we map all
RISC-V fences to full fences.  Now that we have a formal memory model
for RISC-V we can start to take advantage of the strength bits on our
fence instructions.  This requires a bit more though, so I'm going to
split it out because the implementation is still correct without taking
advantage of these weaker fences.

Thanks to Richard Henderson for pointing out both of the issues.

Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r--target/riscv/translate.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/target/riscv/translate.c b/target/riscv/translate.c
index f44eb9c41b..312bf298b3 100644
--- a/target/riscv/translate.c
+++ b/target/riscv/translate.c
@@ -1776,7 +1776,6 @@ static void decode_RV32_64G(CPURISCVState *env, DisasContext *ctx)
                      GET_RM(ctx->opcode));
         break;
     case OPC_RISC_FENCE:
-#ifndef CONFIG_USER_ONLY
         if (ctx->opcode & 0x1000) {
             /* FENCE_I is a no-op in QEMU,
              * however we need to end the translation block */
@@ -1787,7 +1786,6 @@ static void decode_RV32_64G(CPURISCVState *env, DisasContext *ctx)
             /* FENCE is a full memory barrier. */
             tcg_gen_mb(TCG_MO_ALL | TCG_BAR_SC);
         }
-#endif
         break;
     case OPC_RISC_SYSTEM:
         gen_system(env, ctx, MASK_OP_SYSTEM(ctx->opcode), rd, rs1,