update PHP 7+ PGO training routine in 123.09beta01

- add detailed_benchmark.php & phpbench.php PGO training profiles for PHP 7+ in 123.09beta01 and newer versions
centminmod · Sep 12, 2019 · e0d6363 · e0d6363
1 parent aedc549
commit e0d6363
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 1 deletion.
diff --git a/centmin.sh b/centmin.sh
@@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S")
 branchname='123.09beta01'
 SCRIPT_MAJORVER='1.2.3'
 SCRIPT_MINORVER='09'
-SCRIPT_INCREMENTVER='265'
+SCRIPT_INCREMENTVER='266'
 SCRIPT_VERSIONSHORT="${branchname}"
 SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.b${SCRIPT_INCREMENTVER}"
 SCRIPT_DATE='31/10/2019'

diff --git a/inc/php_configure.inc b/inc/php_configure.inc
@@ -1,3 +1,18 @@
+pgophpbench() {
+  echo
+  echo "PGO phpbench setup start"
+  rm -rf "${DIR_TMP}/phpbench"
+  mkdir -p "${DIR_TMP}/phpbench" /opt/phpbench
+  wget -4 -O "${DIR_TMP}/phpbench/phpbench-0.8.1.zip" https://github.com/centminmod/centminmod-php71/raw/master/scripts/phpbench-0.8.1.zip
+  wget -4 -O /opt/phpbench/detailed_benchmark.php https://github.com/centminmod/centminmod-php71/raw/master/scripts/detailed_benchmark.php
+  pushd "${DIR_TMP}/phpbench"
+  unzip phpbench-0.8.1.zip
+  \cp -af tests /opt/phpbench/tests
+  popd
+  echo "PGO phpbench setup end"
+  echo
+}
+
 oniguruma_check() {
   if [[ "$(rpm -qa oniguruma5 oniguruma5-devel | wc -l)" -lt '2' ]]; then
     echo
@@ -1570,6 +1585,16 @@ sar_call
                 echo "./sapi/cgi/php-cgi -T100 "$PHPPGO_INDEXPATH_FOUR""
                 time ./sapi/cgi/php-cgi -T100 "$PHPPGO_INDEXPATH_FOUR"
             fi
+            echo "pgophpbench"
+            pgophpbench
+            if [ -f "${DIR_TMP}/phpbench/phpbench.php" ]; then
+              echo "./sapi/cgi/php-cgi -T10 ${DIR_TMP}/phpbench/phpbench.php"
+              time ./sapi/cgi/php-cgi -T10 "${DIR_TMP}/phpbench/phpbench.php"
+            fi
+            if [ -f /opt/phpbench/detailed_benchmark.php ]; then
+              echo "./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php"
+              time ./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php
+            fi
         elif [ -d "$DIR_TMP/php_pgo_training_scripts" ]; then
             pushd "$DIR_TMP/php_pgo_training_scripts"
             git stash
@@ -1600,6 +1625,16 @@ sar_call
                 echo "./sapi/cgi/php-cgi -T80 "$PHPPGO_INDEXPATH_FOUR""
                 time ./sapi/cgi/php-cgi -T80 "$PHPPGO_INDEXPATH_FOUR"
             fi
+            echo "pgophpbench"
+            pgophpbench
+            if [ -f "${DIR_TMP}/phpbench/phpbench.php" ]; then
+              echo "./sapi/cgi/php-cgi -T10 ${DIR_TMP}/phpbench/phpbench.php"
+              time ./sapi/cgi/php-cgi -T10 "${DIR_TMP}/phpbench/phpbench.php"
+            fi
+            if [ -f /opt/phpbench/detailed_benchmark.php ]; then
+              echo "./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php"
+              time ./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php
+            fi
         fi
         echo "make prof-clean"
         time make prof-clean

diff --git a/inc/php_upgrade.inc b/inc/php_upgrade.inc
@@ -644,6 +644,16 @@ fi
                 echo "./sapi/cgi/php-cgi -T100 "$PHPPGO_INDEXPATH_FOUR""
                 time ./sapi/cgi/php-cgi -T100 "$PHPPGO_INDEXPATH_FOUR"
             fi
+            echo "pgophpbench"
+            pgophpbench
+            if [ -f "${DIR_TMP}/phpbench/phpbench.php" ]; then
+              echo "./sapi/cgi/php-cgi -T10 ${DIR_TMP}/phpbench/phpbench.php"
+              time ./sapi/cgi/php-cgi -T10 "${DIR_TMP}/phpbench/phpbench.php"
+            fi
+            if [ -f /opt/phpbench/detailed_benchmark.php ]; then
+              echo "./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php"
+              time ./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php
+            fi
         elif [ -d "$DIR_TMP/php_pgo_training_scripts" ]; then
             pushd "$DIR_TMP/php_pgo_training_scripts"
             git stash
@@ -674,6 +684,16 @@ fi
                 echo "./sapi/cgi/php-cgi -T80 "$PHPPGO_INDEXPATH_FOUR""
                 time ./sapi/cgi/php-cgi -T80 "$PHPPGO_INDEXPATH_FOUR"
             fi
+            echo "pgophpbench"
+            pgophpbench
+            if [ -f "${DIR_TMP}/phpbench/phpbench.php" ]; then
+              echo "./sapi/cgi/php-cgi -T10 ${DIR_TMP}/phpbench/phpbench.php"
+              time ./sapi/cgi/php-cgi -T10 "${DIR_TMP}/phpbench/phpbench.php"
+            fi
+            if [ -f /opt/phpbench/detailed_benchmark.php ]; then
+              echo "./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php"
+              time ./sapi/cgi/php-cgi -T20 /opt/phpbench/detailed_benchmark.php
+            fi
         fi
         echo "make prof-clean"
         time make prof-clean