Skip to content
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

i#4698 detach_state: Port signal + GPR-cache tests to A64 #4708

Merged
merged 3 commits into from
Feb 4, 2021
+368 −121
Merged

i#4698 detach_state: Port signal + GPR-cache tests to A64 #4708

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6b5480
i#4698 detach_state: Port signal + GPR-cache tests to A64
derekbruening Jan 29, 2021
9d0e990
Remove clang-format on comment at end of file to work around clang-fo…
derekbruening Feb 3, 2021
95ba190
Reorder callee-saved regs to natural order; fix indentation
derekbruening Feb 4, 2021
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
6 changes: 5 additions & 1 deletion core/arch/asm_defines.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* **********************************************************
* Copyright (c) 2011-2020 Google, Inc. All rights reserved.
* Copyright (c) 2011-2021 Google, Inc. All rights reserved.
* Copyright (c) 2008-2009 VMware, Inc. All rights reserved.
* ********************************************************** */

Expand Down Expand Up @@ -791,15 +791,19 @@ ASSUME fs:_DATA @N@\
# define REG_SCRATCH0 REG_XAX
# define REG_SCRATCH1 REG_XCX
# define REG_SCRATCH2 REG_XDX
# define REG_SP REG_XSP
# define JUMP jmp
# define JUMP_NOT_EQUAL jne
# define RETURN ret
# define INC(reg) inc reg
# define DEC(reg) dec reg
#elif defined(AARCHXX)
# define REG_SCRATCH0 REG_R0
# define REG_SCRATCH1 REG_R1
# define REG_SCRATCH2 REG_R2
# define REG_SP sp
# define JUMP b
# define JUMP_NOT_EQUAL b.ne
# ifdef X64
# define RETURN ret
# else
Expand Down
8 changes: 7 additions & 1 deletion make/CMake_asm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# **********************************************************
# Copyright (c) 2021 Google, Inc. All rights reserved.
# Copyright (c) 2009 VMware, Inc. All rights reserved.
# **********************************************************

Expand Down Expand Up @@ -28,12 +29,17 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
# DAMAGE.

# we can't put in newlines with cpp so we do it ourselves
# We can't put in newlines with cpp so we do it ourselves.
file(READ ${file} string)
string(REGEX REPLACE
"\@N\@"
"\n"
string "${string}")
# Ditto with '#'.
string(REGEX REPLACE
"\@P\@"
"#"
string "${string}")
# MacOS "cpp -E" on macros with token pasting leaves ## in place!
# And while "gcc -E" does not, it has the linker warning, so we just
# remove them here.
Expand Down
5 changes: 3 additions & 2 deletions suite/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2836,12 +2836,13 @@ if (CLIENT_INTERFACE)
endif ()
tobuild_api(api.detach api/detach.c "" "" OFF OFF)
link_with_pthread(api.detach)
# TODO: port detach_state to aarchxx
if (X86 AND LINUX AND X64) # Will take extra work to port to 32-bit.
if (LINUX AND X64) # Will take extra work to port to 32-bit.
tobuild_api(api.detach_state api/detach_state.c "" "" OFF OFF)
target_include_directories(api.detach_state PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/api)
link_with_pthread(api.detach_state)
set_source_files_properties(detach_state.c_asm.asm APPEND_LIST PROPERTIES
OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/api/detach_state_shared.h")
if (proc_supports_avx512)
append_property_string(TARGET api.detach_state COMPILE_FLAGS "${CFLAGS_AVX512}")
set(api.detach_state_runavx512 1)
Expand Down
Loading