1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
From fdfad81006c2c964781b616f0a75578507be809c Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 21 Mar 2018 17:38:41 -0400
Subject: [PATCH] Add support for the RISC-V architecture
Tested in QEMU 2.12.0-rc0, requires --disable-compiler-tls to go
through the benchmarks reliably.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Upstream-Status: Backport
---
configure.ac | 1 +
include/Makefile.am | 2 ++
include/urcu/arch/riscv.h | 49 ++++++++++++++++++++++++++++++++++++++++++++
include/urcu/uatomic/riscv.h | 44 +++++++++++++++++++++++++++++++++++++++
4 files changed, 96 insertions(+)
create mode 100644 include/urcu/arch/riscv.h
create mode 100644 include/urcu/uatomic/riscv.h
diff --git a/configure.ac b/configure.ac
index d0b4a9ac..9145081a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,7 @@ AS_CASE([$host_cpu],
[tile*], [ARCHTYPE="tile"],
[hppa*], [ARCHTYPE="hppa"],
[m68k], [ARCHTYPE="m68k"],
+ [riscv*], [ARCHTYPE="riscv"],
[ARCHTYPE="unknown"]
)
diff --git a/include/Makefile.am b/include/Makefile.am
index dcdf304b..36667b43 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \
urcu/arch/mips.h \
urcu/arch/nios2.h \
urcu/arch/ppc.h \
+ urcu/arch/riscv.h \
urcu/arch/s390.h \
urcu/arch/sparc64.h \
urcu/arch/tile.h \
@@ -43,6 +44,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \
urcu/uatomic/mips.h \
urcu/uatomic/nios2.h \
urcu/uatomic/ppc.h \
+ urcu/uatomic/riscv.h \
urcu/uatomic/s390.h \
urcu/uatomic/sparc64.h \
urcu/uatomic/tile.h \
diff --git a/include/urcu/arch/riscv.h b/include/urcu/arch/riscv.h
new file mode 100644
index 00000000..1fd7d62b
--- /dev/null
+++ b/include/urcu/arch/riscv.h
@@ -0,0 +1,49 @@
+#ifndef _URCU_ARCH_RISCV_H
+#define _URCU_ARCH_RISCV_H
+
+/*
+ * arch/riscv.h: definitions for the RISC-V architecture
+ *
+ * Copyright (c) 2018 Michael Jeanson <mjeanson@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <urcu/compiler.h>
+#include <urcu/config.h>
+#include <urcu/syscall-compat.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdlib.h>
+#include <sys/time.h>
+
+/*
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
+ */
+#if (defined(__linux__) && !defined(__NR_membarrier))
+#define __NR_membarrier 283
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <urcu/arch/generic.h>
+
+#endif /* _URCU_ARCH_RISCV_H */
diff --git a/include/urcu/uatomic/riscv.h b/include/urcu/uatomic/riscv.h
new file mode 100644
index 00000000..a6700e17
--- /dev/null
+++ b/include/urcu/uatomic/riscv.h
@@ -0,0 +1,44 @@
+/*
+ * Atomic exchange operations for the RISC-V architecture. Let GCC do it.
+ *
+ * Copyright (c) 2018 Michael Jeanson <mjeanson@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef _URCU_ARCH_UATOMIC_RISCV_H
+#define _URCU_ARCH_UATOMIC_RISCV_H
+
+#include <urcu/compiler.h>
+#include <urcu/system.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define UATOMIC_HAS_ATOMIC_BYTE
+#define UATOMIC_HAS_ATOMIC_SHORT
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <urcu/uatomic/generic.h>
+
+#endif /* _URCU_ARCH_UATOMIC_RISCV_H */
|
