Skip to content

Commit d37552a

Browse files
kddnewtonmeta-codesync[bot]
authored andcommitted
aarch64 support
Summary: Enable aarch64 for the CinderX JIT by letting it pass through the initial architecture check. Reviewed By: jbower-fb, DinoV Differential Revision: D86123384 fbshipit-source-id: 0e2aedb36fd2658195393b92c00107d43e526a81
1 parent 12adfec commit d37552a

3 files changed

Lines changed: 15 additions & 9 deletions

File tree

cinderx/Jit/codegen/arch/detection.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
#pragma once
44

5+
// This macro is a marker for places that need platform-specific code.
6+
#define CINDER_UNSUPPORTED
7+
58
#if defined(__x86_64__)
69

710
#define CINDER_X86_64
@@ -10,14 +13,8 @@
1013

1114
#define CINDER_AARCH64
1215

13-
// This is here until we have aarch64 support everywhere.
14-
#define CINDER_UNSUPPORTED
15-
1616
#else
1717

1818
#define CINDER_UNKNOWN
1919

20-
// This macro is a marker for places that need platform-specific code.
21-
#define CINDER_UNSUPPORTED
22-
2320
#endif

cinderx/Jit/pyjit.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3449,10 +3449,10 @@ int initialize() {
34493449
}
34503450

34513451
// Do this check after config is initialized, so we can use JIT_DLOG().
3452-
#ifndef __x86_64__
3452+
#if !defined(__x86_64__) && !defined(__aarch64__)
34533453
JIT_DLOG(
3454-
"JIT only supported x86-64 platforms, detected current architecture as "
3455-
"'{}'. Disabling the JIT.",
3454+
"JIT only supported x86-64 or aarch64 platforms, detected current "
3455+
"architecture as '{}'. Disabling the JIT.",
34563456
getCpuArchName());
34573457
return 0;
34583458
#endif
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
test_cinderx.test_cinderjit
2+
test_cinderx.test_compiler.test_static.compile
3+
test_cinderx.test_compiler.test_static.elide_type_checks
4+
test_cinderx.test_jit_async_generators
5+
test_cinderx.test_jit_disable
6+
test_cinderx.test_jit_frame
7+
test_cinderx.test_jit_perf_map
8+
test_cinderx.test_jit_preload
9+
test_cinderx.test_python312_bytecodes
110
test.test_ctypes
211
test.test_faulthandler
312
test.test_posix

0 commit comments

Comments
 (0)