update

wjr-z · Aug 17, 2024 · 98e1846 · 98e1846
1 parent 4feb478
commit 98e1846
Show file tree

Hide file tree

Showing 55 changed files with 242 additions and 84 deletions.
diff --git a/include/wjr/generic/math/bignum-config.hpp → ...e/wjr/arch/generic/math/bignum-config.hpp b/include/wjr/generic/math/bignum-config.hpp → ...e/wjr/arch/generic/math/bignum-config.hpp
diff --git a/.../wjr/x86/container/generic/bplus_tree.hpp → ...arch/x86/container/generic/bplus_tree.hpp b/.../wjr/x86/container/generic/bplus_tree.hpp → ...arch/x86/container/generic/bplus_tree.hpp
@@ -3,7 +3,7 @@
 
 #include <algorithm>
 
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/format/charconv.hpp → include/wjr/arch/x86/format/charconv.hpp b/include/wjr/x86/format/charconv.hpp → include/wjr/arch/x86/format/charconv.hpp
@@ -2,7 +2,7 @@
 #define WJR_X86_FORMAT_CHARCONV_HPP__
 
 #include <wjr/format/charconv-impl.hpp>
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #ifndef WJR_X86
 #error "x86 required"

diff --git a/include/wjr/x86/format/utf8/utf8.hpp → include/wjr/arch/x86/format/utf8/utf8.hpp b/include/wjr/x86/format/utf8/utf8.hpp → include/wjr/arch/x86/format/utf8/utf8.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_FORMAT_UTF8_HPP__
 #define WJR_X86_FORMAT_UTF8_HPP__
 
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 namespace wjr::utf8 {} // namespace wjr::utf8
 

diff --git a/include/wjr/x86/json/lexer.hpp → include/wjr/arch/x86/json/lexer.hpp b/include/wjr/x86/json/lexer.hpp → include/wjr/arch/x86/json/lexer.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_JSON_LEXER_HPP__
 #define WJR_X86_JSON_LEXER_HPP__
 
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #if WJR_HAS_SIMD(SSSE3)
 #define WJR_HAS_BUILTIN_JSON_LEXER_READER_READ_BUF WJR_HAS_DEF

diff --git a/include/wjr/x86/json/string.hpp → include/wjr/arch/x86/json/string.hpp b/include/wjr/x86/json/string.hpp → include/wjr/arch/x86/json/string.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_JSON_STRING_HPP__
 #define WJR_X86_JSON_STRING_HPP__
 
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #if WJR_HAS_SIMD(SSE2)
 #define WJR_HAS_BUILTIN_JSON_PARSE_STRING WJR_HAS_DEF

diff --git a/include/wjr/x86/math/add.hpp → include/wjr/arch/x86/math/add.hpp b/include/wjr/x86/math/add.hpp → include/wjr/arch/x86/math/add.hpp
@@ -30,7 +30,7 @@
 #endif
 
 #if WJR_HAS_BUILTIN(ASM_ADDC) == 2
-#include <wjr/x86/simd/intrin.hpp>
+#include <wjr/arch/x86/simd/intrin.hpp>
 #endif
 
 namespace wjr {
@@ -190,7 +190,7 @@ WJR_INTRINSIC_INLINE uint64_t asm_addc_cc(uint64_t a, uint64_t b, uint8_t c_in,
 
 #if WJR_HAS_BUILTIN(ASM_ADDC_N)
 #define WJR_ADDSUB_I 1
-#include <wjr/x86/math/gen_addsub.hpp>
+#include <wjr/arch/x86/math/gen_addsub.hpp>
 #endif
 
 #if WJR_HAS_BUILTIN(__ASM_ADD_128)

diff --git a/include/wjr/x86/math/compare.hpp → include/wjr/arch/x86/math/compare.hpp b/include/wjr/x86/math/compare.hpp → include/wjr/arch/x86/math/compare.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_MATH_COMPARE_HPP__
 #define WJR_X86_MATH_COMPARE_HPP__
 
-#include <wjr/x86/math/large-compare-impl.hpp>
+#include <wjr/arch/x86/math/large-compare-impl.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/math/div.hpp → include/wjr/arch/x86/math/div.hpp b/include/wjr/x86/math/div.hpp → include/wjr/arch/x86/math/div.hpp
diff --git a/include/wjr/x86/math/divider.hpp → include/wjr/arch/x86/math/divider.hpp b/include/wjr/x86/math/divider.hpp → include/wjr/arch/x86/math/divider.hpp
diff --git a/include/wjr/x86/math/find.hpp → include/wjr/arch/x86/math/find.hpp b/include/wjr/x86/math/find.hpp → include/wjr/arch/x86/math/find.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_MATH_FIND_HPP__
 #define WJR_X86_MATH_FIND_HPP__
 
-#include <wjr/x86/math/large-find-impl.hpp>
+#include <wjr/arch/x86/math/large-find-impl.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/math/gen_addrsblsh_n.hpp → ...ude/wjr/arch/x86/math/gen_addrsblsh_n.hpp b/include/wjr/x86/math/gen_addrsblsh_n.hpp → ...ude/wjr/arch/x86/math/gen_addrsblsh_n.hpp
diff --git a/include/wjr/x86/math/gen_addsub.hpp → include/wjr/arch/x86/math/gen_addsub.hpp b/include/wjr/x86/math/gen_addsub.hpp → include/wjr/arch/x86/math/gen_addsub.hpp
diff --git a/include/wjr/x86/math/large-compare-impl.hpp → .../wjr/arch/x86/math/large-compare-impl.hpp b/include/wjr/x86/math/large-compare-impl.hpp → .../wjr/arch/x86/math/large-compare-impl.hpp
@@ -3,7 +3,7 @@
 
 #include <wjr/math/clz.hpp>
 #include <wjr/math/ctz.hpp>
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #ifndef WJR_X86
 #error "x86 required"

diff --git a/include/wjr/x86/math/large-find-impl.hpp → ...ude/wjr/arch/x86/math/large-find-impl.hpp b/include/wjr/x86/math/large-find-impl.hpp → ...ude/wjr/arch/x86/math/large-find-impl.hpp
@@ -3,7 +3,7 @@
 
 #include <wjr/math/clz.hpp>
 #include <wjr/math/ctz.hpp>
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #ifndef WJR_X86
 #error "x86 required"

diff --git a/include/wjr/x86/math/mul-impl.hpp → include/wjr/arch/x86/math/mul-impl.hpp b/include/wjr/x86/math/mul-impl.hpp → include/wjr/arch/x86/math/mul-impl.hpp
diff --git a/include/wjr/x86/math/mul.hpp → include/wjr/arch/x86/math/mul.hpp b/include/wjr/x86/math/mul.hpp → include/wjr/arch/x86/math/mul.hpp
@@ -2,10 +2,10 @@
 #define WJR_X86_MATH_MUL_HPP__
 
 #include <wjr/assert.hpp>
-#include <wjr/x86/math/mul-impl.hpp>
+#include <wjr/arch/x86/math/mul-impl.hpp>
 
 #if WJR_HAS_BUILTIN(MSVC_UMUL128)
-#include <wjr/x86/simd/intrin.hpp>
+#include <wjr/arch/x86/simd/intrin.hpp>
 #endif
 
 namespace wjr {
@@ -83,12 +83,12 @@ WJR_INTRINSIC_INLINE uint64_t asm_submul_1(uint64_t *dst, const uint64_t *src, s
 
 #if WJR_HAS_BUILTIN(ASM_ADDLSH_N)
 #define WJR_ADDSUB_I 1
-#include <wjr/x86/math/gen_addrsblsh_n.hpp>
+#include <wjr/arch/x86/math/gen_addrsblsh_n.hpp>
 #endif
 
 #if WJR_HAS_BUILTIN(ASM_RSBLSH_N)
 #define WJR_ADDSUB_I 0
-#include <wjr/x86/math/gen_addrsblsh_n.hpp>
+#include <wjr/arch/x86/math/gen_addrsblsh_n.hpp>
 #endif
 
 #if WJR_HAS_BUILTIN(ASM_BASECASE_MUL_S)

diff --git a/include/wjr/x86/math/not.hpp → include/wjr/arch/x86/math/not.hpp b/include/wjr/x86/math/not.hpp → include/wjr/arch/x86/math/not.hpp
@@ -2,7 +2,7 @@
 #define WJR_X86_MATH_NOT_HPP__
 
 #include <wjr/math/detail.hpp>
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #ifndef WJR_X86
 #error "x86 required"

diff --git a/include/wjr/x86/math/prefix_xor.hpp → include/wjr/arch/x86/math/prefix_xor.hpp b/include/wjr/x86/math/prefix_xor.hpp → include/wjr/arch/x86/math/prefix_xor.hpp
@@ -2,7 +2,7 @@
 #define WJR_X86_MATH_PREFIX_XOR_HPP__
 
 #include <wjr/preprocessor.hpp>
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/math/set.hpp → include/wjr/arch/x86/math/set.hpp b/include/wjr/x86/math/set.hpp → include/wjr/arch/x86/math/set.hpp
@@ -3,7 +3,7 @@
 
 #include <cstring>
 
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #ifndef WJR_X86
 #error "x86 required"

diff --git a/include/wjr/x86/math/shift.hpp → include/wjr/arch/x86/math/shift.hpp b/include/wjr/x86/math/shift.hpp → include/wjr/arch/x86/math/shift.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_MATH_SHIFT_HPP__
 #define WJR_X86_MATH_SHIFT_HPP__
 
-#include <wjr/x86/simd/simd.hpp>
+#include <wjr/arch/x86/simd/simd.hpp>
 
 #ifndef WJR_X86
 #error "x86 required"

diff --git a/include/wjr/x86/math/sub.hpp → include/wjr/arch/x86/math/sub.hpp b/include/wjr/x86/math/sub.hpp → include/wjr/arch/x86/math/sub.hpp
@@ -30,7 +30,7 @@
 #endif
 
 #if WJR_HAS_BUILTIN(ASM_SUBC) == 2
-#include <wjr/x86/simd/intrin.hpp>
+#include <wjr/arch/x86/simd/intrin.hpp>
 #endif
 
 namespace wjr {
@@ -128,7 +128,7 @@ WJR_INTRINSIC_INLINE uint64_t asm_subc_cc(uint64_t a, uint64_t b, uint8_t c_in,
 
 #if WJR_HAS_BUILTIN(ASM_SUBC_N)
 #define WJR_ADDSUB_I 0
-#include <wjr/x86/math/gen_addsub.hpp>
+#include <wjr/arch/x86/math/gen_addsub.hpp>
 #endif
 
 #if WJR_HAS_BUILTIN(__ASM_SUB_128)

diff --git a/include/wjr/x86/simd/avx.hpp → include/wjr/arch/x86/simd/avx.hpp b/include/wjr/x86/simd/avx.hpp → include/wjr/arch/x86/simd/avx.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_SIMD_AVX_HPP__
 #define WJR_X86_SIMD_AVX_HPP__
 
-#include <wjr/x86/simd/sse.hpp>
+#include <wjr/arch/x86/simd/sse.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/simd/intrin.hpp → include/wjr/arch/x86/simd/intrin.hpp b/include/wjr/x86/simd/intrin.hpp → include/wjr/arch/x86/simd/intrin.hpp
diff --git a/include/wjr/x86/simd/simd.hpp → include/wjr/arch/x86/simd/simd.hpp b/include/wjr/x86/simd/simd.hpp → include/wjr/arch/x86/simd/simd.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_SIMD_SIMD_HPP__
 #define WJR_X86_SIMD_SIMD_HPP__
 
-#include <wjr/x86/simd/avx.hpp>
+#include <wjr/arch/x86/simd/avx.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/simd/simd_cast.hpp → include/wjr/arch/x86/simd/simd_cast.hpp b/include/wjr/x86/simd/simd_cast.hpp → include/wjr/arch/x86/simd/simd_cast.hpp
@@ -4,7 +4,7 @@
 #include <cstdint>
 
 #include <wjr/simd/detail.hpp>
-#include <wjr/x86/simd/intrin.hpp>
+#include <wjr/arch/x86/simd/intrin.hpp>
 
 namespace wjr {
 

diff --git a/include/wjr/x86/simd/sse.hpp → include/wjr/arch/x86/simd/sse.hpp b/include/wjr/x86/simd/sse.hpp → include/wjr/arch/x86/simd/sse.hpp
@@ -1,7 +1,7 @@
 #ifndef WJR_X86_SIMD_SSE_HPP__
 #define WJR_X86_SIMD_SSE_HPP__
 
-#include <wjr/x86/simd/simd_cast.hpp>
+#include <wjr/arch/x86/simd/simd_cast.hpp>
 
 #include <cstring>
 

diff --git a/include/wjr/container/generic/bplus_tree.hpp b/include/wjr/container/generic/bplus_tree.hpp
@@ -30,7 +30,7 @@
 #include <wjr/memory/uninitialized.hpp>
 
 #if defined(WJR_X86)
-#include <wjr/x86/container/generic/bplus_tree.hpp>
+#include <wjr/arch/x86/container/generic/bplus_tree.hpp>
 #endif
 
 namespace wjr {

diff --git a/include/wjr/format/charconv.hpp b/include/wjr/format/charconv.hpp
@@ -13,7 +13,7 @@
 #include <wjr/string.hpp>
 
 #if defined(WJR_X86)
-#include <wjr/x86/format/charconv.hpp>
+#include <wjr/arch/x86/format/charconv.hpp>
 #endif
 
 namespace wjr {

diff --git a/include/wjr/format/utf8/utf8.hpp b/include/wjr/format/utf8/utf8.hpp
@@ -6,7 +6,7 @@
 #include <wjr/expected.hpp>
 
 #if defined(WJR_X86)
-#include <wjr/x86/format/utf8/utf8.hpp>
+#include <wjr/arch/x86/format/utf8/utf8.hpp>
 #endif
 
 namespace wjr::utf8 {