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

Linux arm64 support. #1453

Merged
merged 2 commits into from
May 28, 2021
Merged

Linux arm64 support. #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
442d087
stackTrace: support aarch64/linux
Nov 15, 2020
a1dffe0
timing: support aarch64/linux
Nov 15, 2020
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
30 changes: 24 additions & 6 deletions pxr/base/arch/stackTrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,6 @@ nonLockingLinux__execve (const char *file,
char *const argv[],
char *const envp[])
{
#if defined(ARCH_BITS_64)
/*
* We make a direct system call here, because we can't find an
* execve which corresponds with the non-locking fork we call
Expand All @@ -594,7 +593,27 @@ nonLockingLinux__execve (const char *file,
* hangs in a threaded app. (We use the non-locking fork to get
* around problems with forking when we have had memory
* corruption.) whew.
*
*/

unsigned long result;

#if defined (__aarch64__)
{
register long __file_result asm ("x0") = (long)file;
register char* const* __argv asm ("x1") = argv;
register char* const* __envp asm ("x2") = envp;
register long __num_execve asm ("x8") = 221;
__asm__ __volatile__ (
"svc 0"
: "=r" (__file_result)
: "r"(__num_execve), "r" (__file_result), "r" (__argv), "r" (__envp)
: "memory"
);
result = __file_result;
}
#elif defined(ARCH_CPU_INTEL) && defined(ARCH_BITS_64)

/*
* %rdi, %rsi, %rdx, %rcx, %r8, %r9 are args 0-5
* syscall clobbers %rcx and %r11
*
Expand All @@ -603,7 +622,6 @@ nonLockingLinux__execve (const char *file,
* constraints to gcc.
*/

unsigned long result;
__asm__ __volatile__ (
"mov %0, %%rdi \n\t"
"mov %%rcx, %%rsi \n\t"
Expand All @@ -614,16 +632,16 @@ nonLockingLinux__execve (const char *file,
: "0" (file), "c" (argv), "d" (envp)
: "memory", "cc", "r11"
);
#else
#error Unknown architecture
#endif

if (result >= 0xfffffffffffff000) {
errno = -result;
result = (unsigned int)-1;
}

return result;
#else
#error Unknown architecture
#endif
}

#endif
Expand Down
6 changes: 6 additions & 0 deletions pxr/base/arch/timing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ ARCH_HIDDEN
void
Arch_InitTickTimer()
{
#ifdef __aarch64__
uint64_t counter_hz;
__asm __volatile("mrs %0, CNTFRQ_EL0" : "=&r" (counter_hz));
Arch_NanosecondsPerTick = double(1e9) / double(counter_hz);
#else
// NOTE: Normally ifstream would be cleaner, but it causes crashes when
// used in conjunction with DSOs and the Intel Compiler.
FILE *in;
Expand Down Expand Up @@ -135,6 +140,7 @@ Arch_InitTickTimer()
}

Arch_NanosecondsPerTick = double(1e9) / double(cpuHz);
#endif
}
#elif defined(ARCH_OS_WINDOWS)

Expand Down
6 changes: 5 additions & 1 deletion pxr/base/arch/timing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/// \addtogroup group_arch_SystemFunctions
///@{

#if defined(ARCH_OS_LINUX)
#if defined(ARCH_OS_LINUX) && defined(ARCH_CPU_INTEL)
#include <x86intrin.h>
#elif defined(ARCH_OS_DARWIN)
#include <mach/mach_time.h>
Expand Down Expand Up @@ -69,6 +69,10 @@ ArchGetTickTime()
#elif defined(ARCH_CPU_INTEL)
// On Intel we'll use the rdtsc instruction.
return __rdtsc();
#elif defined (__aarch64__)
uint64_t result;
__asm __volatile("mrs %0, CNTVCT_EL0" : "=&r" (result));
return result;
#else
#error Unknown architecture.
#endif
Expand Down