Skip to content

Implement RISC-V64 atomic_yield fastpath #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev3
Choose a base branch
from
Open

Implement RISC-V64 atomic_yield fastpath #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ option(MI_CHECK_FULL "Use full internal invariant checking in DEBUG mode
option(MI_USE_LIBATOMIC "Explicitly link with -latomic (on older systems) (deprecated and detected automatically)" OFF)

include(CheckLinkerFlag) # requires cmake 3.18
include(CheckCCompilerFlag)
include(CheckIncludeFiles)
include(GNUInstallDirs)
include("cmake/mimalloc-config-version.cmake")
Expand Down Expand Up @@ -151,6 +152,8 @@ if(MI_NO_OPT_ARCH)
set(MI_OPT_ARCH "OFF")
elseif(MI_ARCH STREQUAL "arm64")
set(MI_OPT_ARCH "ON") # enable armv8.1-a by default on arm64 unless MI_NO_OPT_ARCH is set
elseif(MI_ARCH STREQUAL "riscv64")
set(MI_OPT_ARCH "ON") # enable rv64gc_zihintpause by default on riscv64 unless MI_NO_OPT_ARCH is set
endif()


Expand Down Expand Up @@ -454,6 +457,13 @@ if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM
set(MI_OPT_ARCH_FLAGS "-march=haswell;-mavx2") # fast bit scan (since 2013)
elseif(MI_ARCH STREQUAL "arm64")
set(MI_OPT_ARCH_FLAGS "-march=armv8.1-a") # fast atomics (since 2016)
elseif(MI_ARCH STREQUAL "riscv64")
check_c_compiler_flag("-march=rv64gc_zihintpause" MI_HAS_RISCV_PAUSE) # fast atomcs
if(MI_HAS_RISCV_PAUSE)
set(MI_OPT_ARCH_FLAGS "-march=rv64gc_zihintpause") # fast atomics
else()
set(MI_OPT_ARCH_FLAGS "-march=rv64gc")
endif()
endif()
endif()
endif()
Expand Down
13 changes: 12 additions & 1 deletion include/mimalloc/atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,8 @@ static inline void mi_atomic_yield(void) {
#elif (defined(__GNUC__) || defined(__clang__)) && \
(defined(__x86_64__) || defined(__i386__) || \
defined(__aarch64__) || defined(__arm__) || \
defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__))
defined(__powerpc__) || defined(__ppc__) || defined(__PPC__) || defined(__POWERPC__) || \
defined(__riscv))
#if defined(__x86_64__) || defined(__i386__)
static inline void mi_atomic_yield(void) {
__asm__ volatile ("pause" ::: "memory");
Expand Down Expand Up @@ -410,6 +411,16 @@ static inline void mi_atomic_yield(void) {
__asm__ __volatile__ ("or 27,27,27" ::: "memory");
}
#endif
#elif defined(__riscv)
#if defined(__riscv_zihintpause)
static inline void mi_atomic_yield(void) {
__asm__ volatile ("pause");
}
#else
static inline void mi_atomic_yield(void) {
__asm__ volatile ("nop");
}
#endif
#endif
#elif defined(__sun)
// Fallback for other archs
Expand Down