move CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512 to check_mask.inl.h

Antares0982 · Jan 1, 2025 · 27c39d5 · 27c39d5
1 parent c084846
commit 27c39d5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/src/encode/encode_simd_utils.inl.h b/src/encode/encode_simd_utils.inl.h
@@ -6,40 +6,12 @@
 #include "commondef/w_in.inl.h"
 
 
-// read only
-#define CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512 PYYJSON_CONCAT2(check_escape_tail_impl_get_mask_512, COMPILE_READ_UCS_LEVEL)
 // write only or read-write
 #define WRITE_SIMD_IMPL PYYJSON_CONCAT3(write_simd_impl, COMPILE_READ_UCS_LEVEL, COMPILE_WRITE_UCS_LEVEL)
 #define WRITE_SIMD_256_WITH_WRITEMASK PYYJSON_CONCAT2(write_simd_256_with_writemask, COMPILE_WRITE_UCS_LEVEL)
 #define BACK_WRITE_SIMD256_WITH_TAIL_LEN PYYJSON_CONCAT3(back_write_simd256_with_tail_len, COMPILE_READ_UCS_LEVEL, COMPILE_WRITE_UCS_LEVEL)
 #define MASK_ELEVATE_WRITE_512 PYYJSON_CONCAT3(mask_elevate_write_512, COMPILE_READ_UCS_LEVEL, COMPILE_WRITE_UCS_LEVEL)
 
-
-#if COMPILE_WRITE_UCS_LEVEL == 4
-#    if SIMD_BIT_SIZE == 512
-force_inline SIMD_MASK_TYPE CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512(SIMD_512 z, SIMD_MASK_TYPE rw_mask) {
-#        define CUR_QUOTE PYYJSON_SIMPLE_CONCAT2(_Quote_i, READ_BIT_SIZE)
-#        define CUR_SLASH PYYJSON_SIMPLE_CONCAT2(_Slash_i, READ_BIT_SIZE)
-#        define CUR_CONTROL_MAX PYYJSON_SIMPLE_CONCAT2(_ControlMax_i, READ_BIT_SIZE)
-#        define CMPEQ PYYJSON_SIMPLE_CONCAT3(_mm512_mask_cmpeq_epi, READ_BIT_SIZE, _mask)
-#        define CMPLT PYYJSON_SIMPLE_CONCAT3(_mm512_mask_cmplt_epu, READ_BIT_SIZE, _mask)
-    SIMD_512 t1 = load_512_aligned((const void *)CUR_QUOTE);
-    SIMD_512 t2 = load_512_aligned((const void *)CUR_SLASH);
-    SIMD_512 t3 = load_512_aligned((const void *)CUR_CONTROL_MAX);
-    SIMD_MASK_TYPE m1 = CMPEQ(rw_mask, z, t1); // AVX512BW / AVX512F
-    SIMD_MASK_TYPE m2 = CMPEQ(rw_mask, z, t2); // AVX512BW / AVX512F
-    SIMD_MASK_TYPE m3 = CMPLT(rw_mask, z, t3); // AVX512BW / AVX512F
-    return m1 | m2 | m3;
-#        undef CMPLT
-#        undef CMPEQ
-#        undef CUR_CONTROL_MAX
-#        undef CUR_SLASH
-#        undef CUR_QUOTE
-}
-#    endif // SIMD_BIT_SIZE == 512
-#endif     // COMPILE_WRITE_UCS_LEVEL == 4
-
-
 force_inline void WRITE_SIMD_IMPL(_TARGET_TYPE *dst, SIMD_TYPE SIMD_VAR) {
 #if COMPILE_READ_UCS_LEVEL == COMPILE_WRITE_UCS_LEVEL
     // write as it is
@@ -228,5 +200,4 @@ force_inline void MASK_ELEVATE_WRITE_512(_TARGET_TYPE *dst, SIMD_512 z, Py_ssize
 #undef BACK_WRITE_SIMD256_WITH_TAIL_LEN
 #undef WRITE_SIMD_256_WITH_WRITEMASK
 #undef WRITE_SIMD_IMPL
-#undef CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512
 #undef CHECK_COUNT_MAX
diff --git a/src/encode/encode_unicode_impl.inl.h b/src/encode/encode_unicode_impl.inl.h
@@ -25,6 +25,10 @@
 // forward declaration
 force_inline SIMD_MASK_TYPE CHECK_ESCAPE_IMPL_GET_MASK(const _FROM_TYPE *src, SIMD_TYPE *restrict SIMD_VAR);
 force_inline u32 GET_DONE_COUNT_FROM_MASK(SIMD_MASK_TYPE mask);
+#if SIMD_BIT_SIZE == 512
+force_inline SIMD_MASK_TYPE CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512(SIMD_512 z, SIMD_MASK_TYPE rw_mask);
+#endif
+
 
 #if COMPILE_READ_UCS_LEVEL == 1 && COMPILE_INDENT_LEVEL == 0
 static _TARGET_TYPE _CONTROL_SEQ_TABLE[(_Slash + 1) * 8] = {

diff --git a/src/simd/check_mask.inl.h b/src/simd/check_mask.inl.h
@@ -4,6 +4,7 @@
 
 #define CHECK_ESCAPE_IMPL_GET_MASK PYYJSON_CONCAT2(check_escape_impl_get_mask, COMPILE_READ_UCS_LEVEL)
 #define GET_DONE_COUNT_FROM_MASK PYYJSON_CONCAT2(get_done_count_from_mask, COMPILE_READ_UCS_LEVEL)
+#define CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512 PYYJSON_CONCAT2(check_escape_tail_impl_get_mask_512, COMPILE_READ_UCS_LEVEL)
 
 force_inline SIMD_MASK_TYPE CHECK_ESCAPE_IMPL_GET_MASK(const _FROM_TYPE *src, SIMD_TYPE *restrict SIMD_VAR) {
 #if SIMD_BIT_SIZE == 512
@@ -109,5 +110,28 @@ force_inline u32 GET_DONE_COUNT_FROM_MASK(SIMD_MASK_TYPE mask) {
     return done_count;
 }
 
+#if SIMD_BIT_SIZE == 512
+force_inline SIMD_MASK_TYPE CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512(SIMD_512 z, SIMD_MASK_TYPE rw_mask) {
+#    define CUR_QUOTE PYYJSON_SIMPLE_CONCAT2(_Quote_i, READ_BIT_SIZE)
+#    define CUR_SLASH PYYJSON_SIMPLE_CONCAT2(_Slash_i, READ_BIT_SIZE)
+#    define CUR_CONTROL_MAX PYYJSON_SIMPLE_CONCAT2(_ControlMax_i, READ_BIT_SIZE)
+#    define CMPEQ PYYJSON_SIMPLE_CONCAT3(_mm512_mask_cmpeq_epi, READ_BIT_SIZE, _mask)
+#    define CMPLT PYYJSON_SIMPLE_CONCAT3(_mm512_mask_cmplt_epu, READ_BIT_SIZE, _mask)
+    SIMD_512 t1 = load_512_aligned((const void *)CUR_QUOTE);
+    SIMD_512 t2 = load_512_aligned((const void *)CUR_SLASH);
+    SIMD_512 t3 = load_512_aligned((const void *)CUR_CONTROL_MAX);
+    SIMD_MASK_TYPE m1 = CMPEQ(rw_mask, z, t1); // AVX512BW / AVX512F
+    SIMD_MASK_TYPE m2 = CMPEQ(rw_mask, z, t2); // AVX512BW / AVX512F
+    SIMD_MASK_TYPE m3 = CMPLT(rw_mask, z, t3); // AVX512BW / AVX512F
+    return m1 | m2 | m3;
+#    undef CMPLT
+#    undef CMPEQ
+#    undef CUR_CONTROL_MAX
+#    undef CUR_SLASH
+#    undef CUR_QUOTE
+}
+#endif // SIMD_BIT_SIZE == 512
+
+#undef CHECK_ESCAPE_TAIL_IMPL_GET_MASK_512
 #undef GET_DONE_COUNT_FROM_MASK
 #undef CHECK_ESCAPE_IMPL_GET_MASK