Upload callgrind profile to GA (php#12212)

iluuu1994 · web-flow · commit 6349b293e7f4 · 2023-09-14T19:52:31.000+02:00
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -288,3 +288,8 @@ jobs:
             ${{ github.sha }} \
             $(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.sha }}) \
             > $GITHUB_STEP_SUMMARY
+      - uses: actions/upload-artifact@v3
+        with:
+          name: profiles
+          path: ${{ github.workspace }}/benchmark/profiles
+          retention-days: 30
diff --git a/benchmark/.gitignore b/benchmark/.gitignore
@@ -1 +1,2 @@
+/profiles
 /repos
diff --git a/benchmark/benchmark.php b/benchmark/benchmark.php
@@ -12,6 +12,11 @@
 function main() {
     global $storeResult;
 
+    $profilesDir = __DIR__ . '/profiles';
+    if (!is_dir($profilesDir)) {
+        mkdir($profilesDir, 0755, true);
+    }
+
     $data = [];
     if (false !== $branch = getenv('GITHUB_REF_NAME')) {
         $data['branch'] = $branch;
@@ -50,15 +55,15 @@ function getPhpSrcCommitHash(): string {
 }
 
 function runBench(bool $jit): array {
-    return runValgrindPhpCgiCommand([dirname(__DIR__) . '/Zend/bench.php'], jit: $jit);
+    return runValgrindPhpCgiCommand('bench', [dirname(__DIR__) . '/Zend/bench.php'], jit: $jit);
 }
 
 function runSymfonyDemo(bool $jit): array {
     $dir = __DIR__ . '/repos/symfony-demo-2.2.3';
     cloneRepo($dir, 'https://github.com/php/benchmarking-symfony-demo-2.2.3.git');
     runPhpCommand([$dir . '/bin/console', 'cache:clear']);
     runPhpCommand([$dir . '/bin/console', 'cache:warmup']);
-    return runValgrindPhpCgiCommand([$dir . '/public/index.php'], cwd: $dir, jit: $jit, warmup: 50, repeat: 50);
+    return runValgrindPhpCgiCommand('symfony-demo', [$dir . '/public/index.php'], cwd: $dir, jit: $jit, warmup: 50, repeat: 50);
 }
 
 function runWordpress(bool $jit): array {
@@ -81,26 +86,33 @@ function runWordpress(bool $jit): array {
 
     // Warmup
     runPhpCommand([$dir . '/index.php'], $dir);
-    return runValgrindPhpCgiCommand([$dir . '/index.php'], cwd: $dir, jit: $jit, warmup: 50, repeat: 50);
+    return runValgrindPhpCgiCommand('wordpress', [$dir . '/index.php'], cwd: $dir, jit: $jit, warmup: 50, repeat: 50);
 }
 
 function runPhpCommand(array $args, ?string $cwd = null): ProcessResult {
     return runCommand([PHP_BINARY, ...$args], $cwd);
 }
 
 function runValgrindPhpCgiCommand(
+    string $name,
     array $args,
     ?string $cwd = null,
     bool $jit = false,
     int $warmup = 0,
     int $repeat = 1,
 ): array {
     global $phpCgi;
+
+    $profileOut = __DIR__ . "/profiles/callgrind.out.$name";
+    if ($jit) {
+        $profileOut .= '.jit';
+    }
+
     $process = runCommand([
         'valgrind',
         '--tool=callgrind',
         '--dump-instr=yes',
-        '--callgrind-out-file=/dev/null',
+        "--callgrind-out-file=$profileOut",
         '--',
         $phpCgi,
         '-T' . ($warmup ? $warmup . ',' : '') . $repeat,
