From fcea4f79ba3c119b993e54205af6722dbbdf24d8 Mon Sep 17 00:00:00 2001
From: Jan Matyas <50193733+JanMatCodasip@users.noreply.github.com>
Date: Fri, 10 Jan 2020 21:29:10 +0100
Subject: [PATCH] Don't issue extra FENCE+FENCE.i for the current hart. (#439)

The original OpenOCD code issued FENCE & FENCE.i twice for the current
hart (which is harmless, but takes time).

Avoiding this extra FENCE is a slight performance improvement. Per my rough
measurements, this improves performance of certain debugger actions
(single-stepping) by approx. 20% in single-hart systems.
---
 src/target/riscv/riscv-013.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 548c6d5cf..bc7035f77 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -2010,6 +2010,10 @@ static int execute_fence(struct target *target)
 		if (!riscv_hart_enabled(target, i))
 			continue;
 
+		if (i == old_hartid)
+			/* Fence already executed for this hart */
+			continue;
+
 		riscv_set_current_hartid(target, i);
 
 		struct riscv_program program;