build: relocated src/cpu/aarch64/xbyak_aarch64 to third_party

oneapi-src · Jan 15, 2025 · d4846fa · d4846fa
1 parent b2a9850
commit d4846fa
Show file tree

Hide file tree

Showing 26 changed files with 3 additions and 10 deletions.
diff --git a/src/cpu/aarch64/CMakeLists.txt b/src/cpu/aarch64/CMakeLists.txt
@@ -20,13 +20,6 @@ file(GLOB_RECURSE SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/*.[ch]pp
     )
 
-file(GLOB XBYAK_AARCH64_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/xbyak_aarch64/src/xbyak_aarch64_impl.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/xbyak_aarch64/src/util_impl.cpp
-    )
-
-list(REMOVE_ITEM SOURCES ${XBYAK_AARCH64_FILES})
-
 if(NOT DNNL_AARCH64_USE_ACL)
     file(GLOB_RECURSE ACL_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/acl_*.[ch]
@@ -49,4 +42,4 @@ add_library(${OBJ_LIB} OBJECT ${SOURCES})
 set_property(GLOBAL APPEND PROPERTY DNNL_LIB_DEPS
     $<TARGET_OBJECTS:${OBJ_LIB}>)
 
-add_subdirectory(xbyak_aarch64)
+add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/xbyak_aarch64 xbyak_aarch64)
diff --git a/src/cpu/aarch64/cpu_isa_traits.hpp b/src/cpu/aarch64/cpu_isa_traits.hpp
@@ -31,8 +31,8 @@
 #define XBYAK_USE_MMAP_ALLOCATOR
 #endif
 
-#include "cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h"
-#include "cpu/aarch64/xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_util.h"
+#include "xbyak_aarch64/xbyak_aarch64/xbyak_aarch64.h"
+#include "xbyak_aarch64/xbyak_aarch64/xbyak_aarch64_util.h"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/cpu/aarch64/xbyak_aarch64/.clang-format → third_party/xbyak_aarch64/.clang-format b/src/cpu/aarch64/xbyak_aarch64/.clang-format → third_party/xbyak_aarch64/.clang-format
diff --git a/src/cpu/aarch64/xbyak_aarch64/CMakeLists.txt → third_party/xbyak_aarch64/CMakeLists.txt b/src/cpu/aarch64/xbyak_aarch64/CMakeLists.txt → third_party/xbyak_aarch64/CMakeLists.txt
diff --git a/src/cpu/aarch64/xbyak_aarch64/src/err_impl.h → third_party/xbyak_aarch64/src/err_impl.h b/src/cpu/aarch64/xbyak_aarch64/src/err_impl.h → third_party/xbyak_aarch64/src/err_impl.h
diff --git a/...u/aarch64/xbyak_aarch64/src/util_impl.cpp → third_party/xbyak_aarch64/src/util_impl.cpp b/...u/aarch64/xbyak_aarch64/src/util_impl.cpp → third_party/xbyak_aarch64/src/util_impl.cpp
diff --git a/...cpu/aarch64/xbyak_aarch64/src/util_impl.h → third_party/xbyak_aarch64/src/util_impl.h b/...cpu/aarch64/xbyak_aarch64/src/util_impl.h → third_party/xbyak_aarch64/src/util_impl.h
diff --git a/...rch64/xbyak_aarch64/src/util_impl_linux.h → ...party/xbyak_aarch64/src/util_impl_linux.h b/...rch64/xbyak_aarch64/src/util_impl_linux.h → ...party/xbyak_aarch64/src/util_impl_linux.h
diff --git a/...aarch64/xbyak_aarch64/src/util_impl_mac.h → ...d_party/xbyak_aarch64/src/util_impl_mac.h b/...aarch64/xbyak_aarch64/src/util_impl_mac.h → ...d_party/xbyak_aarch64/src/util_impl_mac.h
diff --git a/...h64/xbyak_aarch64/src/util_impl_windows.h → ...rty/xbyak_aarch64/src/util_impl_windows.h b/...h64/xbyak_aarch64/src/util_impl_windows.h → ...rty/xbyak_aarch64/src/util_impl_windows.h
diff --git a/.../xbyak_aarch64/src/xbyak_aarch64_impl.cpp → .../xbyak_aarch64/src/xbyak_aarch64_impl.cpp b/.../xbyak_aarch64/src/xbyak_aarch64_impl.cpp → .../xbyak_aarch64/src/xbyak_aarch64_impl.cpp
diff --git a/...64/xbyak_aarch64/src/xbyak_aarch64_impl.h → ...ty/xbyak_aarch64/src/xbyak_aarch64_impl.h b/...64/xbyak_aarch64/src/xbyak_aarch64_impl.h → ...ty/xbyak_aarch64/src/xbyak_aarch64_impl.h
diff --git a/...byak_aarch64/src/xbyak_aarch64_mnemonic.h → ...byak_aarch64/src/xbyak_aarch64_mnemonic.h b/...byak_aarch64/src/xbyak_aarch64_mnemonic.h → ...byak_aarch64/src/xbyak_aarch64_mnemonic.h
diff --git a/...yak_aarch64/xbyak_aarch64/xbyak_aarch64.h → ...yak_aarch64/xbyak_aarch64/xbyak_aarch64.h b/...yak_aarch64/xbyak_aarch64/xbyak_aarch64.h → ...yak_aarch64/xbyak_aarch64/xbyak_aarch64.h
diff --git a/...aarch64/xbyak_aarch64/xbyak_aarch64_adr.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_adr.h b/...aarch64/xbyak_aarch64/xbyak_aarch64_adr.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_adr.h
diff --git a/.../xbyak_aarch64/xbyak_aarch64_code_array.h → .../xbyak_aarch64/xbyak_aarch64_code_array.h b/.../xbyak_aarch64/xbyak_aarch64_code_array.h → .../xbyak_aarch64/xbyak_aarch64_code_array.h
diff --git a/...aarch64/xbyak_aarch64/xbyak_aarch64_err.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_err.h b/...aarch64/xbyak_aarch64/xbyak_aarch64_err.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_err.h
diff --git a/...aarch64/xbyak_aarch64/xbyak_aarch64_gen.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_gen.h b/...aarch64/xbyak_aarch64/xbyak_aarch64_gen.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_gen.h
diff --git a/...rch64/xbyak_aarch64/xbyak_aarch64_inner.h → ...rch64/xbyak_aarch64/xbyak_aarch64_inner.h b/...rch64/xbyak_aarch64/xbyak_aarch64_inner.h → ...rch64/xbyak_aarch64/xbyak_aarch64_inner.h
diff --git a/...rch64/xbyak_aarch64/xbyak_aarch64_label.h → ...rch64/xbyak_aarch64/xbyak_aarch64_label.h b/...rch64/xbyak_aarch64/xbyak_aarch64_label.h → ...rch64/xbyak_aarch64/xbyak_aarch64_label.h
diff --git a/...yak_aarch64/xbyak_aarch64_meta_mnemonic.h → ...yak_aarch64/xbyak_aarch64_meta_mnemonic.h b/...yak_aarch64/xbyak_aarch64_meta_mnemonic.h → ...yak_aarch64/xbyak_aarch64_meta_mnemonic.h
diff --git a/...byak_aarch64/xbyak_aarch64_mnemonic_def.h → ...byak_aarch64/xbyak_aarch64_mnemonic_def.h b/...byak_aarch64/xbyak_aarch64_mnemonic_def.h → ...byak_aarch64/xbyak_aarch64_mnemonic_def.h
diff --git a/...arch64/xbyak_aarch64/xbyak_aarch64_perf.h → ...arch64/xbyak_aarch64/xbyak_aarch64_perf.h b/...arch64/xbyak_aarch64/xbyak_aarch64_perf.h → ...arch64/xbyak_aarch64/xbyak_aarch64_perf.h
diff --git a/...aarch64/xbyak_aarch64/xbyak_aarch64_reg.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_reg.h b/...aarch64/xbyak_aarch64/xbyak_aarch64_reg.h → ...aarch64/xbyak_aarch64/xbyak_aarch64_reg.h
diff --git a/...arch64/xbyak_aarch64/xbyak_aarch64_util.h → ...arch64/xbyak_aarch64/xbyak_aarch64_util.h b/...arch64/xbyak_aarch64/xbyak_aarch64_util.h → ...arch64/xbyak_aarch64/xbyak_aarch64_util.h
diff --git a/...h64/xbyak_aarch64/xbyak_aarch64_version.h → ...h64/xbyak_aarch64/xbyak_aarch64_version.h b/...h64/xbyak_aarch64/xbyak_aarch64_version.h → ...h64/xbyak_aarch64/xbyak_aarch64_version.h