com web/rmtools: Sync with the SDK changes for PGO training case whitelisting: data/config/branch/x64/phpmaster.ini include/BranchConfig.php
include/BuildVC.php

Commit: b6ff58a977a29419bf009dee9ff6f50eff2b89f6 Author: Anatol Belski <ab@php.net> Fri, 11 May 2018 14:02:24 +0200 Parents: 9aa5df4ddd7a0742e46ca88acdac1a0349e4e4ca Branches: master Link: http://git.php.net/?p=web/rmtools.git;a=commitdiff;h=b6ff58a977a29419bf009dee9ff6f50eff2b89f6 Log: Sync with the SDK changes for PGO training case whitelisting Also, rework the configuration according to the new build matrix. Changed paths: M data/config/branch/x64/phpmaster.ini M include/BranchConfig.php M include/BuildVC.php Diff: diff --git a/data/config/branch/x64/phpmaster.ini b/data/config/branch/x64/phpmaster.ini index a10cb55..1644eca 100644 --- a/data/config/branch/x64/phpmaster.ini +++ b/data/config/branch/x64/phpmaster.ini @@ -25,19 +25,21 @@ arch=x64 configure_options=--enable-snapshot-build --enable-debug-pack --with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --enable-com-dotnet=shared --without-analyzer platform=windows -[build-nts-windows-vc15-x64-avx] -name=nts-windows-vc15-x64 +[build-nts-windows-vc15-x64-avx-flavor1] +name=nts-windows-vc15-x64-avx-flavor1 compiler=vc15 arch=x64 configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack --with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --enable-com-dotnet=shared --without-analyzer --enable-native-intrinsics=avx platform=windows intrinsics=avx +pgo_cases=pgo01org,mediawiki,wordpress -[build-ts-windows-vc15-x64-avx] -name=ts-windows-vc15-x64 +[build-nts-windows-vc15-x64-avx-flavor2] +name=nts-windows-vc15-x64-avx-flavor2 compiler=vc15 arch=x64 -configure_options=--enable-snapshot-build --enable-debug-pack --with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --enable-com-dotnet=shared --without-analyzer --enable-native-intrinsics=avx +configure_options=--enable-snapshot-build --disable-zts --enable-debug-pack --with-pdo-oci=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --with-oci8-12c=c:/php-snap-build/deps_aux/oracle/x64/instantclient_12_1/sdk,shared --enable-com-dotnet=shared --without-analyzer --enable-native-intrinsics=avx platform=windows intrinsics=avx +pgo_cases=symfony_demo,symfony_demo_pdo_mysql,wordpress,joomla diff --git a/include/BranchConfig.php b/include/BranchConfig.php index 19283d3..d085e59 100644 --- a/include/BranchConfig.php +++ b/include/BranchConfig.php @@ -85,6 +85,15 @@ class BranchConfig { return explode(",", $this->config["pgo_scenario"]); } + function getPgoCases() + { + if (!isset($this->config["pgo_cases"])) { + return NULL; + } + + return explode(",", $this->config["pgo_cases"]); + } + public static function getRequiredBuildsNum($path, $branch) { $files = glob("$path/*/$branch.ini"); diff --git a/include/BuildVC.php b/include/BuildVC.php index ad829f2..07827c5 100644 --- a/include/BuildVC.php +++ b/include/BuildVC.php @@ -178,7 +178,8 @@ class BuildVC { $env["Path"] = dirname($this->build_dir) . DIRECTORY_SEPARATOR . "deps" . DIRECTORY_SEPARATOR . "bin;" . $env["Path"]; foreach ($this->branch->config->getPgoScenarios() as $scenario) { - $cmd = 'phpsdk_pgo --train --scenario=' . $scenario; + $cases = $this->branch->config->getPgoCases(); + $cmd = 'phpsdk_pgo --train --scenario=' . $scenario . ($cases ? (" --cases=" . implode(",", $cases)) : ""); $ret = exec_single_log($cmd, $this->build_dir, $env); if (!$ret || 0 !== (int)$ret["return_value"]) { if ($ret["log"]) {