archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reflect native instruction set in snap filename

Browse source
This commit is contained in:
Anatol Belski 2018-03-02 20:39:41 +01:00
parent fd5a635225
commit c7dc6cc66b
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
win32/build/Makefile
View file

@ -25,15 +25,25 @@ RE2C="$(RE2C)"
PGOMGR="$(PGOMGR)" PGOMGR="$(PGOMGR)"
PHP_BUILD=$(PHP_BUILD) PHP_BUILD=$(PHP_BUILD)
!if "$(PHP_SIMD_SCALE)" == ""
SIMD_SUFFIX=""
!else
!if "$(PHP_SIMD_SCALE)" == "SSE2"
SIMD_SUFFIX=""
!else
SIMD_SUFFIX=-$(PHP_SIMD_SCALE)
!endif
!endif
MCFILE=$(BUILD_DIR)\wsyslog.rc MCFILE=$(BUILD_DIR)\wsyslog.rc
BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE) BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX)
BUILD_DIR_DEV=$(BUILD_DIR)\$(BUILD_DIR_DEV_NAME) BUILD_DIR_DEV=$(BUILD_DIR)\$(BUILD_DIR_DEV_NAME)
DIST_ZIP_SNAP=php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip DIST_ZIP_SNAP=php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
DIST_ZIP_PECL=pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip DIST_ZIP_PECL=pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
DIST_ZIP_DEV_PACK=php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip DIST_ZIP_DEV_PACK=php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
DIST_ZIP_TEST_PACK=php-test-pack-$(PHP_VERSION_STRING).zip DIST_ZIP_TEST_PACK=php-test-pack-$(PHP_VERSION_STRING)$(SIMD_SUFFIX).zip
DIST_ZIP_DEBUG_PACK=php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip DIST_ZIP_DEBUG_PACK=php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
!if "$(DEBUGGER)" == "1" !if "$(DEBUGGER)" == "1"
DEBUGGER_CMD=devenv DEBUGGER_CMD=devenv

6
win32/build/confutils.js
View file

@ -1958,7 +1958,7 @@ function write_summary()
} }
var simd = configure_subst.Item("PHP_SIMD_SCALE"); var simd = configure_subst.Item("PHP_SIMD_SCALE");
if (!!simd) { if (!!simd) {
ar[k++] = ["Native SIMD", simd.toUpperCase()]; ar[k++] = ["Native intrinsics", simd];
} }
if (PHP_ANALYZER == "vs") { if (PHP_ANALYZER == "vs") {
ar[k++] = ['Static analyzer', 'Visual Studio']; ar[k++] = ['Static analyzer', 'Visual Studio'];
@ -3267,7 +3267,7 @@ function toolset_setup_intrinsic_cflags()
/* All means all. __AVX__ and __AVX2__ are defined by compiler. */ /* All means all. __AVX__ and __AVX2__ are defined by compiler. */
ADD_FLAG("CFLAGS","/arch:AVX2"); ADD_FLAG("CFLAGS","/arch:AVX2");
configure_subst.Add("PHP_SIMD_SCALE", "avx2"); configure_subst.Add("PHP_SIMD_SCALE", "AVX2");
} else { } else {
var list = PHP_NATIVE_INTRINSICS.split(","); var list = PHP_NATIVE_INTRINSICS.split(",");
var j = 0; var j = 0;
@ -3289,7 +3289,7 @@ function toolset_setup_intrinsic_cflags()
ADD_FLAG("CFLAGS","/arch:SSE"); ADD_FLAG("CFLAGS","/arch:SSE");
} }
} }
configure_subst.Add("PHP_SIMD_SCALE", scale[j]); configure_subst.Add("PHP_SIMD_SCALE", scale[j].toUpperCase());
/* There is no explicit way to enable intrinsics between SSE3 and SSE4.2. /* There is no explicit way to enable intrinsics between SSE3 and SSE4.2.
The declared macros therefore won't affect the code generation, The declared macros therefore won't affect the code generation,
but will enable the guarded code parts. */ but will enable the guarded code parts. */