File 0696-erts-Call-__builtin___clear_cache-for-hipe... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0696-erts-Call-builtin_clear_cache-for-hipe-x86-code.patch of Package erlang (Revision ee5107dd2cb9269b862e70debf0422c2)

Currently displaying revision ee5107dd2cb9269b862e70debf0422c2 , Show latest

From dc67b706ea7091caae2d55eab45f59f1d125fa1d Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 29 May 2019 16:03:14 +0200
Subject: [PATCH] erts: Call __builtin___clear_cache for hipe x86 code

Seems the right thing to do as the compiled code is not necessarily
executed by a single CPU thread.

Only warning if old gcc and will work as good/bad as it did before.
---
 erts/emulator/hipe/hipe_x86.h | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/erts/emulator/hipe/hipe_x86.h b/erts/emulator/hipe/hipe_x86.h
index 8967793171..a1fe75e792 100644
--- a/erts/emulator/hipe/hipe_x86.h
+++ b/erts/emulator/hipe/hipe_x86.h
@@ -22,17 +22,28 @@
 #ifndef HIPE_X86_H
 #define HIPE_X86_H
 
-static __inline__ void hipe_flush_icache_word(void *address)
-{
-    /* Do nothing. This works as long as compiled code is
-       executed by a single CPU thread. */
-}
+#ifndef __has_builtin
+# define __has_builtin(x) 0
+#endif
 
 static __inline__ void
 hipe_flush_icache_range(void *address, unsigned int nbytes)
 {
-    /* Do nothing. This works as long as compiled code is
-       executed by a single CPU thread. */
+    void* end = (char*)address + nbytes;
+
+#if ERTS_AT_LEAST_GCC_VSN__(4, 3, 0) || __has_builtin(__builtin___clear_cache)
+    __builtin___clear_cache(address, end);
+#elif defined(__clang__)
+    void __clear_cache(void *start, void *end);
+    __clear_cache(address, end);
+#else
+# warning "Don't know how to flush instruction cache"
+#endif
+}
+
+static __inline__ void hipe_flush_icache_word(void *address)
+{
+    hipe_flush_icache_range(address, sizeof(void*));
 }
 
 /* for stack descriptor hash lookup */
-- 
2.16.4

Places

File 0696-erts-Call-builtin_clear_cache-for-hipe-x86-code.patch of Package erlang (Revision ee5107dd2cb9269b862e70debf0422c2)

Places

Places

File 0696-erts-Call-__builtin___clear_cache-for-hipe-x86-code.patch of Package erlang (Revision ee5107dd2cb9269b862e70debf0422c2)

Places

File 0696-erts-Call-builtin_clear_cache-for-hipe-x86-code.patch of Package erlang (Revision ee5107dd2cb9269b862e70debf0422c2)