perf: switched to jom for windows builds

Author: NickSdot

.github/actions/setup-windows/action.yml

@@ -2,6 +2,17 @@ name: Setup
 runs:
   using: composite
   steps:
+    - name: Setup jom
+      shell: pwsh
+      run: |
+        $jomDirectory = Join-Path $env:RUNNER_TEMP "jom"
+        $jomArchive = Join-Path $env:RUNNER_TEMP "jom.zip"
+        Invoke-WebRequest https://download.qt.io/official_releases/jom/jom_1_1_7.zip -OutFile $jomArchive
+        if ((Get-FileHash $jomArchive -Algorithm SHA256).Hash -ne "4C8AF345586A9A08FBFD2F613FCAC748226D91A75627AA3581B297DD513046FE") {
+          throw "Unexpected jom archive checksum"
+        }
+        Expand-Archive $jomArchive -DestinationPath $jomDirectory
+        $jomDirectory | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
     - name: Setup MySQL
       shell: cmd
       run: |

.github/matrix.php

@@ -8,6 +8,9 @@
     ['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => [8, 2]],
 ];
 
+// Temporary while profiling Windows CI builds. Remove after this work is complete.
+const WINDOWS_ONLY_CI = true;
+
 function get_branch_commit_cache_file_path(): string {
     return dirname(__DIR__) . '/branch-commit-cache.json';
 }
@@ -180,13 +183,16 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
 
 $labels = json_decode($argv[4] ?? '[]', true) ?? [];
 $labels = array_column($labels, 'name');
-$all_variations = $nightly || in_array('CI: All variations', $labels, true);
+$all_variations = WINDOWS_ONLY_CI || $nightly || in_array('CI: All variations', $labels, true);
 
 $repository = $argv[5] ?? null;
 
 foreach ($branches as &$branch) {
     $php_version = $branch['version'][0] . '.' . $branch['version'][1];
     $branch['jobs'] = select_jobs($repository, $trigger, $nightly, $labels, $php_version, $branch['ref'], $all_variations);
+    if (WINDOWS_ONLY_CI) {
+        $branch['jobs'] = array_intersect_key($branch['jobs'], ['WINDOWS' => true]);
+    }
     $branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04';
 }
 

.github/scripts/windows/build_task.bat

@@ -41,6 +41,7 @@ if "%CLANG_TOOLSET%" equ "1" (
 
 cmd /c configure.bat ^
 	--enable-snapshot-build ^
+	--enable-parallel-build ^
 	--disable-debug-pack ^
 	--without-analyzer ^
 	--enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^
@@ -49,9 +50,9 @@ cmd /c configure.bat ^
 	--disable-test-ini
 if %errorlevel% neq 0 exit /b 3
 
-nmake /NOLOGO
+jom /NOLOGO
 if %errorlevel% neq 0 exit /b 3
-nmake /NOLOGO comtest.dll
+jom /NOLOGO comtest.dll
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0

win32/build/Makefile

@@ -54,14 +54,36 @@ DEBUGGER_ARGS=
 
 all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS) test_helpers
 
+!if "$(PARALLEL_BUILD)" == "yes"
+BUILD_DIR_TARGET=build_dirs
+!else
 build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV)
+BUILD_DIR_TARGET=$(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV)
+!endif
 
 !if $(RE2C) == ""
+!if "$(PARALLEL_BUILD)" == "yes"
+generated_files: build_dirs .SYNC \
+	Zend\zend_ini_parser.c .SYNC Zend\zend_ini_parser.h .SYNC \
+	Zend\zend_language_parser.c .SYNC \
+	sapi\phpdbg\phpdbg_parser.c .SYNC \
+	$(PHPDEF) .SYNC $(MCFILE)
+!else
 generated_files: build_dirs \
 	Zend\zend_ini_parser.c Zend\zend_ini_parser.h \
 	Zend\zend_language_parser.c \
 	sapi\phpdbg\phpdbg_parser.c \
 	$(PHPDEF) $(MCFILE)
+!endif
+!else
+!if "$(PARALLEL_BUILD)" == "yes"
+generated_files: build_dirs .SYNC \
+	Zend\zend_ini_parser.c .SYNC Zend\zend_ini_parser.h .SYNC \
+	Zend\zend_language_parser.c .SYNC \
+	Zend\zend_ini_scanner.c .SYNC Zend\zend_ini_scanner_defs.h .SYNC \
+	Zend\zend_language_scanner.c .SYNC Zend\zend_language_scanner_defs.h .SYNC \
+	sapi\phpdbg\phpdbg_parser.c .SYNC sapi\phpdbg\phpdbg_lexer.c .SYNC \
+	$(PHPDEF) .SYNC $(MCFILE)
 !else
 generated_files: build_dirs \
 	Zend\zend_ini_parser.c Zend\zend_ini_parser.h \
@@ -71,6 +93,7 @@ generated_files: build_dirs \
 	sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_lexer.c \
 	$(PHPDEF) $(MCFILE)
 !endif
+!endif
 
 $(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES)
 	type $(PHP_DLL_DEF_SOURCES) > $(BUILD_DIR)\$(PHPDLL).def
@@ -138,7 +161,7 @@ $(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EX
 
 $(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
 
-$(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV):
+$(BUILD_DIR_TARGET):
 	@echo Recreating build dirs
 	@if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
 	@cd $(BUILD_DIR)

win32/build/config.w32

@@ -62,13 +62,18 @@ DEFINE('PHP_PREFIX', PHP_PREFIX);
 
 DEFINE("BASE_INCLUDES", "/I . /I main /I Zend /I TSRM /I ext ");
 
+ARG_ENABLE('parallel-build', 'Generate independent object targets for a parallel NMAKE-compatible tool', 'no');
+DEFINE('PARALLEL_BUILD', PHP_PARALLEL_BUILD);
+
 toolset_setup_common_cflags();
 
 if (VS_TOOLSET) {
 	ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto');
 	var PHP_MP_DISABLED = true;
 
-	if (PHP_MP != 'disable') {
+	if (PHP_PARALLEL_BUILD == 'yes') {
+		STDOUT.WriteLine('Using make-level parallel compilation');
+	} else if (PHP_MP != 'disable') {
 		if(PHP_DEBUG == 'yes') {
 			STDOUT.WriteLine('WARNING: Debug builds cannot be built using multi processing');
 		} else {

win32/build/confutils.js

@@ -1613,6 +1613,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir, duplicate_sources)
 	var i;
 	var tv;
 	var src, obj, sym, flags;
+	var parallel_build = typeof PHP_PARALLEL_BUILD != "undefined" && PHP_PARALLEL_BUILD == "yes";
 
 	if (target == null) {
 		target = "php";
@@ -1712,7 +1713,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir, duplicate_sources)
 		srcs_by_dir[build_dir].push(i);
 	}
 
-	if (!duplicate_sources) {
+	if (!duplicate_sources && !parallel_build) {
 		/* Create makefile build targets and dependencies. */
 		MFO.WriteLine(objs_line + ": " + srcs_line);
 	}
@@ -1730,7 +1731,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir, duplicate_sources)
 		var mangle_dir = k.replace(new RegExp("[\\\\/.-]", "g"), "_");
 		var bd_flags_name = "CFLAGS_BD_" + mangle_dir.toUpperCase();
 
-		if (VS_TOOLSET) {
+		if (VS_TOOLSET && !parallel_build) {
 			ADD_FLAG(bd_flags_name, "/Fd" + sub_build + d);
 		}
 
@@ -1797,7 +1798,36 @@ function ADD_SOURCES(dir, file_list, target, obj_dir, duplicate_sources)
 		}
 
 		if (!duplicate_sources) {
-			if (PHP_MP_DISABLED) {
+			if (parallel_build) {
+				for (var j in srcs_by_dir[k]) {
+					src = file_list[srcs_by_dir[k][j]];
+
+					var _tmp = src.split("\\");
+					var filename = _tmp.pop();
+					obj = sub_build + d + filename.replace(re, ".obj");
+
+					/* A parallel make needs one recipe owner per output. Generated files are
+					 * an explicit prerequisite instead of relying on nmake's serial order. */
+					MFO.WriteLine(obj + ": generated_files " + dir + "\\" + src);
+
+					var pdb_flag = "";
+					if (VS_TOOLSET) {
+						/* Concurrent cl.exe processes must not share a PDB/IDB file. */
+						pdb_flag = " /Fd" + sub_build + d + filename.replace(re, ".pdb");
+					}
+
+					MFO.WriteLine("\t" + CMD_MOD1 + "$(CC) $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ")" + pdb_flag + " /c " + dir + "\\" + src + " /Fo" + obj);
+
+					if ("clang" == PHP_ANALYZER) {
+						MFO.WriteLine("\t" + CMD_MOD1 + "\"$(CLANG_CL)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + dir + "\\" + src);
+					} else if ("cppcheck" == PHP_ANALYZER) {
+						MFO.WriteLine("\t\"" + CMD_MOD1 + "$(CPPCHECK)\" " + analyzer_base_args + " $(" + flags + "_ANALYZER) $(CFLAGS_ANALYZER) $(" + bd_flags_name + "_ANALYZER) " + analyzer_base_flags + " " + dir + "\\" + src);
+					} else if (PHP_ANALYZER == "pvs") {
+						MFO.WriteLine("\t" + CMD_MOD1 + "\"$(PVS_STUDIO)\" --cl-params $(" + flags + ") $(CFLAGS) $(" + bd_flags_name + ")" + pdb_flag + " /c " + dir + "\\" + src + " --source-file " + dir + "\\" + src
+							+ " --cfg PVS-Studio.conf --errors-off \"V122 V117 V111\" ");
+					}
+				}
+			} else if (PHP_MP_DISABLED) {
 				for (var j in srcs_by_dir[k]) {
 					src = file_list[srcs_by_dir[k][j]];