Re: [RFC PATCH v4 12/30] target/loongarch: Add timer related instructions support.

[WANG Xuerui]

On 1/8/22 17:14, Xiaojuan Yang wrote:

This includes:
-RDTIME{L/H}.W
-RDTIME.D

Signed-off-by: Xiaojuan Yang<yangxiaoj...@loongson.cn>
Signed-off-by: Song Gao<gaos...@loongson.cn>
---
  target/loongarch/helper.h                     |  1 +
  target/loongarch/insn_trans/trans_extra.c.inc | 32 +++++++++++++++++++
  target/loongarch/op_helper.c                  |  6 ++++
  target/loongarch/translate.c                  |  2 ++
  4 files changed, 41 insertions(+)

diff --git a/target/loongarch/helper.h b/target/loongarch/helper.h
index c916f2650b..035bd141ed 100644
--- a/target/loongarch/helper.h
+++ b/target/loongarch/helper.h
@@ -116,4 +116,5 @@ DEF_HELPER_4(lddir, tl, env, tl, tl, i32)
  DEF_HELPER_4(ldpte, void, env, tl, tl, i32)
  DEF_HELPER_1(ertn, void, env)
  DEF_HELPER_1(idle, void, env)
+DEF_HELPER_1(rdtime_d, i64, env)

Are we missing rdtimel_w and rdtimeh_w here?

  #endif /* !CONFIG_USER_ONLY */
diff --git a/target/loongarch/insn_trans/trans_extra.c.inc 
b/target/loongarch/insn_trans/trans_extra.c.inc
index 2ce95d3382..8d3425ba61 100644
--- a/target/loongarch/insn_trans/trans_extra.c.inc
+++ b/target/loongarch/insn_trans/trans_extra.c.inc
@@ -33,22 +33,54 @@ static bool trans_asrtgt_d(DisasContext *ctx, arg_asrtgt_d 
* a)
      return true;
  }

+#ifndef CONFIG_USER_ONLY

+static bool gen_rdtime(DisasContext *ctx, arg_rr *a,
+                       bool word, bool high)
+{
+    TCGv dst1 = gpr_dst(ctx, a->rd, EXT_NONE);
+    TCGv dst2 = gpr_dst(ctx, a->rj, EXT_NONE);
+
+    if (tb_cflags(ctx->base.tb) & CF_USE_ICOUNT) {
+        gen_io_start();
+    }
+    gen_helper_rdtime_d(dst1, cpu_env);
+    if (word) {
+        tcg_gen_sextract_tl(dst1, dst1, high ? 32 : 0, 32);
+    }
+    tcg_gen_ld_i64(dst2, cpu_env, offsetof(CPULoongArchState, CSR_TID));
+
+    return true;
+}
+#endif
+
  static bool trans_rdtimel_w(DisasContext *ctx, arg_rdtimel_w *a)
  {
+#ifdef CONFIG_USER_ONLY
      tcg_gen_movi_tl(cpu_gpr[a->rd], 0);
      return true;
+#else
+    return gen_rdtime(ctx, a, 1, 0);
+#endif
  }

static bool trans_rdtimeh_w(DisasContext *ctx, arg_rdtimeh_w *a)

  {
+#ifdef CONFIG_USER_ONLY
      tcg_gen_movi_tl(cpu_gpr[a->rd], 0);
      return true;
+#else
+    return gen_rdtime(ctx, a, 1, 1);
+#endif
  }

static bool trans_rdtime_d(DisasContext *ctx, arg_rdtime_d *a)

  {
+#ifdef CONFIG_USER_ONLY
      tcg_gen_movi_tl(cpu_gpr[a->rd], 0);
      return true;
+#else
+    return gen_rdtime(ctx, a, 0, 0);
+#endif
  }

static bool trans_cpucfg(DisasContext *ctx, arg_cpucfg *a)

diff --git a/target/loongarch/op_helper.c b/target/loongarch/op_helper.c
index 6f9742054a..1d8b501ab9 100644
--- a/target/loongarch/op_helper.c
+++ b/target/loongarch/op_helper.c
@@ -133,4 +133,10 @@ void helper_idle(CPULoongArchState *env)
       */
      do_raise_exception(env, EXCP_HLT, 0);
  }
+
+uint64_t helper_rdtime_d(CPULoongArchState *env)
+{
+     LoongArchCPU *cpu = LOONGARCH_CPU(env_cpu(env));
+     return cpu_loongarch_get_constant_timer_counter(cpu);
+}
  #endif /* !CONFIG_USER_ONLY */
diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c
index ddb97661fa..53a5ef3aa9 100644
--- a/target/loongarch/translate.c
+++ b/target/loongarch/translate.c
@@ -25,6 +25,8 @@ static TCGv cpu_lladdr, cpu_llval;
  TCGv_i32 cpu_fcsr0;
  TCGv_i64 cpu_fpr[32];

+#include "exec/gen-icount.h"

+
  #define DISAS_STOP       DISAS_TARGET_0
  #define DISAS_EXIT       DISAS_TARGET_1