archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rework --with-codegen-arch and --enable-native-intrinsics config

Browse source
This commit is contained in:
Anatol Belski 2018-02-16 16:23:27 +01:00
parent abf5534113
commit d9994ff7b2
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
win32/build/config.w32
View file

@ -325,7 +325,7 @@ if (CLANG_TOOLSET) {
} }
} }
ARG_WITH("codegen-arch", "Architecture for code generation: ia32, sse, sse2, avx, avx2", "no"); ARG_WITH("codegen-arch", "Architecture for code generation: ia32. Use --enable-native-intrinsics to enable SIMD optimizations.", "no");
toolset_setup_codegen_arch(); toolset_setup_codegen_arch();
ARG_WITH("all-shared", "Force all the non obligatory extensions to be shared", "no"); ARG_WITH("all-shared", "Force all the non obligatory extensions to be shared", "no");
@ -343,9 +343,10 @@ ARG_WITH("test-ini-ext-exclude", "Comma separated list of shared extensions to \
be excluded from the test.ini", "no"); be excluded from the test.ini", "no");
ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations to enable. \ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations to enable. \
Available optimization names are sse, sse2, sse4.1, sse4.2. SSE and SSE2 are enabled \ Available optimization names are sse, sse2, sse3, ssse3, sse4.1, sse4.2, avx, avx2. \
by default. The best optimization specified will automatically enable all the older \ SSE and SSE2 are enabled by default. The best optimization specified will \
optimizations. Note, that the produced binary might not work properly, if the \ automatically enable all the older optimizations. Note, that the produced binary \
optimizations are not available on the target processor.", "no"); might not work properly, if the optimizations are not available on the target \
processor.", "no");
toolset_setup_intrinsic_cflags(); toolset_setup_intrinsic_cflags();

14
win32/build/confutils.js
View file

@ -3122,16 +3122,20 @@ function toolset_setup_arch()
function toolset_setup_codegen_arch() function toolset_setup_codegen_arch()
{ {
if("no" == PHP_CODEGEN_ARCH) { if("no" == PHP_CODEGEN_ARCH || "yes" == PHP_CODEGEN_ARCH) {
return; return;
} }
if (VS_TOOLSET) { if (VS_TOOLSET) {
var arc = PHP_CODEGEN_ARCH.toUpperCase(); var arc = PHP_CODEGEN_ARCH.toUpperCase();
if ("AVX2" == arc || "AVX" == arc || "SSE2" == arc || "SSE" == arc || "IA32" == arc) { if ("IA32" != arc) {
ADD_FLAG("CFLAGS", "/arch:" + arc); ERROR("Only IA32 arch is supported by --with-codegen-arch, got '" + arc + "'");
} else if (X64) {
ERROR("IA32 arch is only supported with 32-bit build");
} }
ADD_FLAG("CFLAGS", "/arch:" + arc);
PHP_NATIVE_INTRINSICS = "disabled";
} }
} }
@ -3236,6 +3240,10 @@ function toolset_setup_intrinsic_cflags()
var scale = new Array("sse", "sse2", "sse3", "ssse3", "sse4.1", "sse4.2", "avx", "avx2"); var scale = new Array("sse", "sse2", "sse3", "ssse3", "sse4.1", "sse4.2", "avx", "avx2");
if (VS_TOOLSET) { if (VS_TOOLSET) {
if ("disabled" == PHP_NATIVE_INTRINSICS) {
ERROR("Can't enable intrinsics, --with-codegen-arch passed with an incompatible option. ")
}
if ("no" == PHP_NATIVE_INTRINSICS || "yes" == PHP_NATIVE_INTRINSICS) { if ("no" == PHP_NATIVE_INTRINSICS || "yes" == PHP_NATIVE_INTRINSICS) {
PHP_NATIVE_INTRINSICS = default_enabled; PHP_NATIVE_INTRINSICS = default_enabled;
} }