Skip to content

[Windows] improve clang-cl support (master) #21618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnaud-lb merged 16 commits into from
Apr 20, 2026
+90 −59
Merged

[Windows] improve clang-cl support (master) #21618

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ef1e57a
fix compiling (intl) C++ extensions --with-toolset=clang
henderkes Apr 2, 2026
e8047b6
guard the double extern "C" { ... } for clang-only
henderkes Apr 2, 2026
c59eb65
don't error on warnings with clang
henderkes Apr 2, 2026
d3d5762
enable compiler intrinsics for clang too
henderkes Apr 3, 2026
4ab1f42
make --enable-compiler-intrinsics=no same as disabled
henderkes Apr 3, 2026
51441d8
add clang windows x64 ZTS test
henderkes Apr 3, 2026
ed89da9
remove check if it's clang
henderkes Apr 3, 2026
420de26
debloat logs from common warning
henderkes Apr 3, 2026
bf45553
@shivammathur feedback
henderkes Apr 3, 2026
26bd0c4
remove CI changes
henderkes Apr 14, 2026
8158a3d
rebase on https://github.com/php/php-src/pull/21630
henderkes Apr 14, 2026
6f9ad3d
Merge remote-tracking branch 'upstream/master' into feat/clang-windows
henderkes Apr 14, 2026
8bfb10d
fix default to asan => false
henderkes Apr 15, 2026
297b9f0
bring back explicit error
henderkes Apr 15, 2026
ab81f7b
fix typo
henderkes Apr 15, 2026
05711ab
retrigger CI (Merge remote-tracking branch 'upstream/master' into fea…
henderkes Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/scripts/windows/build_task.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,18 @@ if %errorlevel% neq 0 exit /b 3
if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
if "%ASAN%" equ "1" set ADD_CONF=%ADD_CONF% --enable-sanitizer --enable-debug-pack
if "%CLANG_TOOLSET%" equ "1" set ADD_CONF=%ADD_CONF% --with-toolset=clang

rem C4018: comparison: signed/unsigned mismatch
rem C4146: unary minus operator applied to unsigned type
rem C4244: type conversion, possible loss of data
rem C4267: 'size_t' type conversion, possible loss of data
set CFLAGS=/W3 /WX /wd4018 /wd4146 /wd4244 /wd4267
if "%CLANG_TOOLSET%" equ "1" (
rem Clang is much stricter than MSVC, produces too many warnings that would fail the build with /WX
set CFLAGS=/W3 /wd4018 /wd4146 /wd4244 /wd4267
) else (
set CFLAGS=/W3 /WX /wd4018 /wd4146 /wd4244 /wd4267
)

cmd /c configure.bat ^
--enable-snapshot-build ^
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,35 @@ jobs:
run: .github/scripts/windows/build.bat
- name: Test
run: .github/scripts/windows/test.bat
WINDOWS_CLANG:
if: ${{ fromJson(inputs.branch).jobs.WINDOWS }}
name: "WINDOWS_X64_ZTS_CLANG"
runs-on: windows-2022
env:
PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
PHP_BUILD_OBJ_DIR: C:\obj
PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
PHP_BUILD_SDK_BRANCH: php-sdk-2.5.0
PHP_BUILD_CRT: ${{ fromJson(inputs.branch).jobs.WINDOWS.config.vs_crt_version }}
PLATFORM: x64
THREAD_SAFE: "1"
INTRINSICS: "AVX2"
PARALLEL: -j2
OPCACHE: "1"
CLANG_TOOLSET: "1"
steps:
- name: git config
run: git config --global core.autocrlf false && git config --global core.eol lf
- name: git checkout
uses: actions/checkout@v6
with:
ref: ${{ fromJson(inputs.branch).ref }}
- name: Setup
uses: ./.github/actions/setup-windows
- name: Build
run: .github/scripts/windows/build.bat
- name: Test
run: .github/scripts/windows/test.bat
FREEBSD:
if: ${{ fromJson(inputs.branch).jobs.FREEBSD }}
strategy:
Expand Down
7 changes: 6 additions & 1 deletion TSRM/TSRM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,14 @@ TSRM_API bool tsrm_is_managed_thread(void);
#define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
#define TSRMG_FAST_STATIC(offset, type, element) (TSRMG_FAST_BULK_STATIC(offset, type)->element)
#define TSRMG_FAST_BULK_STATIC(offset, type) ((type) (((char*) TSRMLS_CACHE)+(offset)))
#if defined(__cplusplus) && defined(__clang__)
#define TSRMLS_MAIN_CACHE_EXTERN() extern "C" { extern TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR; }
#define TSRMLS_CACHE_EXTERN() extern "C" { extern TSRM_TLS void *TSRMLS_CACHE; }
#else
#define TSRMLS_MAIN_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR;
Copy link
Copy Markdown
Contributor Author

@henderkes henderkes Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems silly because it's already in an extern "C" block above, but intl fails to compile because it sees _tsrm_ls_cache as both C and C++ named symbol

some macro resolution weirdness that this works around

Copy link
Copy Markdown
Member

@arnaud-lb arnaud-lb Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see it now, extern "C" has no effect on symbols declared by these macros

Copy link
Copy Markdown
Contributor Author

@henderkes henderkes Apr 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah right! it's fine either way, extern "C" { extern "C" { } } is perfectly valid. removed the if clang

#define TSRMLS_MAIN_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR = NULL;
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
#endif
#define TSRMLS_MAIN_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE TSRM_TLS_MODEL_ATTR = NULL;
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
#define TSRMLS_CACHE _tsrm_ls_cache
Expand Down
103 changes: 54 additions & 49 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3397,24 +3397,24 @@ function toolset_setup_intrinsic_cflags()
/* From oldest to newest. */
var scale = new Array("sse", "sse2", "sse3", "ssse3", "sse4.1", "sse4.2", "avx", "avx2", "avx512");

if (VS_TOOLSET) {
if ("disabled" == PHP_NATIVE_INTRINSICS) {
ERROR("Can't enable intrinsics, --with-codegen-arch passed with an incompatible option. ")
}
if ("disabled" == PHP_NATIVE_INTRINSICS || "no" == PHP_NATIVE_INTRINSICS) {
Comment thread
henderkes marked this conversation as resolved.
Outdated
return;
}
Comment thread
henderkes marked this conversation as resolved.

if (TARGET_ARCH == 'arm64') {
/* arm64 supports neon */
configure_subst.Add("PHP_SIMD_SCALE", 'NEON');
/* all officially supported arm64 cpu supports crc32 (TODO: to be confirmed) */
AC_DEFINE('HAVE_ARCH64_CRC32', 1);
return;
}
if (TARGET_ARCH == 'arm64') {
/* arm64 supports neon */
configure_subst.Add("PHP_SIMD_SCALE", 'NEON');
/* all officially supported arm64 cpu supports crc32 (TODO: to be confirmed) */
AC_DEFINE('HAVE_ARCH64_CRC32', 1);
return;
}

if ("no" == PHP_NATIVE_INTRINSICS || "yes" == PHP_NATIVE_INTRINSICS) {
PHP_NATIVE_INTRINSICS = default_enabled;
}
if ("yes" == PHP_NATIVE_INTRINSICS) {
PHP_NATIVE_INTRINSICS = default_enabled;
}

if ("all" == PHP_NATIVE_INTRINSICS) {
if ("all" == PHP_NATIVE_INTRINSICS) {
if (VS_TOOLSET) {
var list = (new VBArray(avail.Keys())).toArray();

for (var i in list) {
Expand All @@ -3423,42 +3423,47 @@ function toolset_setup_intrinsic_cflags()

/* All means all. __AVX__, __AVX2__, and __AVX512*__ are defined by compiler. */
ADD_FLAG("CFLAGS","/arch:AVX512");
configure_subst.Add("PHP_SIMD_SCALE", "AVX512");
} else {
var list = PHP_NATIVE_INTRINSICS.split(",");
var j = 0;
for (var k = 0; k < scale.length; k++) {
for (var i = 0; i < list.length; i++) {
var it = list[i].toLowerCase();
if (scale[k] == it) {
j = k > j ? k : j;
} else if (!avail.Exists(it) && "avx512" != it && "avx2" != it && "avx" != it) {
WARNING("Unknown intrinsic name '" + it + "' ignored");
}
}
}
if (TARGET_ARCH == 'x86') {
/* SSE2 is currently the default on 32-bit. It could change later,
for now no need to pass it. But, if SSE only was chosen,
/arch:SSE is required. */
if ("sse" == scale[j]) {
ADD_FLAG("CFLAGS","/arch:SSE");
} else if (CLANG_TOOLSET) {
ADD_FLAG("CFLAGS","-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl");
}
configure_subst.Add("PHP_SIMD_SCALE", "AVX512");
} else {
var list = PHP_NATIVE_INTRINSICS.split(",");
var j = 0;
for (var k = 0; k < scale.length; k++) {
for (var i = 0; i < list.length; i++) {
var it = list[i].toLowerCase();
if (scale[k] == it) {
j = k > j ? k : j;
} else if (!avail.Exists(it) && "avx512" != it && "avx2" != it && "avx" != it) {
WARNING("Unknown intrinsic name '" + it + "' ignored");
}
}
configure_subst.Add("PHP_SIMD_SCALE", scale[j].toUpperCase());
/* There is no explicit way to enable intrinsics between SSE3 and SSE4.2.
The declared macros therefore won't affect the code generation,
but will enable the guarded code parts. */
if ("avx512" == scale[j]) {
ADD_FLAG("CFLAGS","/arch:AVX512");
j -= 3;
} else if ("avx2" == scale[j]) {
ADD_FLAG("CFLAGS","/arch:AVX2");
j -= 2;
} else if ("avx" == scale[j]) {
ADD_FLAG("CFLAGS","/arch:AVX");
j -= 1;
}
}
if (TARGET_ARCH == 'x86') {
/* SSE2 is currently the default on 32-bit. It could change later,
for now no need to pass it. But, if SSE only was chosen,
/arch:SSE is required. */
if ("sse" == scale[j]) {
ADD_FLAG("CFLAGS", VS_TOOLSET ? "/arch:SSE" : "-msse");
}
}
configure_subst.Add("PHP_SIMD_SCALE", scale[j].toUpperCase());
/* There is no explicit way to enable intrinsics between SSE3 and SSE4.2.
The declared macros therefore won't affect the code generation,
but will enable the guarded code parts. */
Comment thread
henderkes marked this conversation as resolved.
Outdated
if ("avx512" == scale[j]) {
ADD_FLAG("CFLAGS", VS_TOOLSET ? "/arch:AVX512" : "-mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl");
j -= 3;
} else if ("avx2" == scale[j]) {
ADD_FLAG("CFLAGS", VS_TOOLSET ? "/arch:AVX2" : "-mavx2");
j -= 2;
} else if ("avx" == scale[j]) {
ADD_FLAG("CFLAGS", VS_TOOLSET ? "/arch:AVX" : "-mavx");
j -= 1;
}
if (VS_TOOLSET) {
/* MSVC doesn't auto-define SSE macros; clang does with -m flags */
for (var i = 0; i <= j; i++) {
var it = scale[i];
AC_DEFINE(avail.Item(it), 1);
Expand Down
Loading