Reduce duplication in extconf.rb

byroot · byroot · commit 3ae3eeb9d357 · 2025-06-29T12:17:06.000+02:00
diff --git a/ext/json/ext/generator/extconf.rb b/ext/json/ext/generator/extconf.rb
@@ -9,31 +9,7 @@
   $defs << "-DJSON_DEBUG" if ENV["JSON_DEBUG"]
 
   if enable_config('generator-use-simd', default=!ENV["JSON_DISABLE_SIMD"])
-    if RbConfig::CONFIG['host_cpu'] =~ /^(arm.*|aarch64.*)/
-      # Try to compile a small program using NEON instructions
-      if have_header('arm_neon.h')
-        have_type('uint8x16_t', headers=['arm_neon.h']) && try_compile(<<~'SRC')
-          #include <arm_neon.h>
-          int main() {
-              uint8x16_t test = vdupq_n_u8(32);
-              return 0;
-          }
-        SRC
-          $defs.push("-DJSON_ENABLE_SIMD")
-      end
-    end
-
-    if have_header('x86intrin.h') && have_type('__m128i', headers=['x86intrin.h']) && try_compile(<<~'SRC')
-      #include <x86intrin.h>
-      int main() {
-          __m128i test = _mm_set1_epi8(32);
-          return 0;
-      }
-      SRC
-        $defs.push("-DJSON_ENABLE_SIMD")
-    end
-
-    have_header('cpuid.h')
+    require_relative "../simd/conf.rb"
   end
 
   create_makefile 'json/ext/generator'
diff --git a/ext/json/ext/parser/extconf.rb b/ext/json/ext/parser/extconf.rb
@@ -9,31 +9,7 @@
 append_cflags("-std=c99")
 
 if enable_config('parser-use-simd', default=!ENV["JSON_DISABLE_SIMD"])
-    if RbConfig::CONFIG['host_cpu'] =~ /^(arm.*|aarch64.*)/
-      # Try to compile a small program using NEON instructions
-      if have_header('arm_neon.h')
-        have_type('uint8x16_t', headers=['arm_neon.h']) && try_compile(<<~'SRC')
-          #include <arm_neon.h>
-          int main() {
-              uint8x16_t test = vdupq_n_u8(32);
-              return 0;
-          }
-        SRC
-          $defs.push("-DJSON_ENABLE_SIMD")
-      end
-    end
-
-    if have_header('x86intrin.h') && have_type('__m128i', headers=['x86intrin.h']) && try_compile(<<~'SRC')
-      #include <x86intrin.h>
-      int main() {
-          __m128i test = _mm_set1_epi8(32);
-          return 0;
-      }
-      SRC
-        $defs.push("-DJSON_ENABLE_SIMD")
-    end
-
-    have_header('cpuid.h')
-  end
+  require_relative "../simd/conf.rb"
+end
 
 create_makefile 'json/ext/parser'
diff --git a/ext/json/ext/simd/conf.rb b/ext/json/ext/simd/conf.rb
@@ -0,0 +1,25 @@
+if RbConfig::CONFIG['host_cpu'] =~ /^(arm.*|aarch64.*)/
+  # Try to compile a small program using NEON instructions
+  if have_header('arm_neon.h')
+    have_type('uint8x16_t', headers=['arm_neon.h']) && try_compile(<<~'SRC')
+      #include <arm_neon.h>
+      int main() {
+          uint8x16_t test = vdupq_n_u8(32);
+          return 0;
+      }
+    SRC
+      $defs.push("-DJSON_ENABLE_SIMD")
+  end
+end
+
+if have_header('x86intrin.h') && have_type('__m128i', headers=['x86intrin.h']) && try_compile(<<~'SRC')
+  #include <x86intrin.h>
+  int main() {
+      __m128i test = _mm_set1_epi8(32);
+      return 0;
+  }
+  SRC
+    $defs.push("-DJSON_ENABLE_SIMD")
+end
+
+have_header('cpuid.h')
diff --git a/json.gemspec b/json.gemspec
@@ -52,7 +52,7 @@ spec = Gem::Specification.new do |s|
     s.files += Dir["lib/json/ext/**/*.jar"]
   else
     s.extensions = Dir["ext/json/**/extconf.rb"]
-    s.files += Dir["ext/json/**/*.{c,h}"]
+    s.files += Dir["ext/json/**/*.{c,h,rb}"]
   end
 end
 
