Commit f994c2f

iluuu1994 iluuu1994

committed

Implement benchmark diff commit fallback

When the base commit is not benchmarked (yet), iterate first parents of the commit until we find one that is. Fixes GH-18094 Closes GH-18152

1 parent b57f425 commit f994c2fCopy full SHA for f994c2f

File tree

1 file changed

+19

-0

lines changed

benchmark
- generate_diff.php

1 file changed

+19

-0

lines changed

`‎benchmark/generate_diff.php‎`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ function main(?string $headCommitHash, ?string $baseCommitHash) {`
`10`	`10`
`11`	`11`	`$repo = __DIR__ . '/repos/data';`
`12`	`12`	`cloneRepo($repo, 'git@github.com:php/benchmarking-data.git');`
	`13`	`+ $baseCommitHash = find_benchmarked_commit_hash($repo, $baseCommitHash);`
`13`	`14`	`$headSummaryFile = $repo . '/' . substr($headCommitHash, 0, 2) . '/' . $headCommitHash . '/summary.json';`
`14`	`15`	`$baseSummaryFile = $repo . '/' . substr($baseCommitHash, 0, 2) . '/' . $baseCommitHash . '/summary.json';`
`15`	`16`	`if (!file_exists($headSummaryFile)) {`
`@@ -60,6 +61,24 @@ function formatDiff(?int $baseInstructions, int $headInstructions): string {`
`60`	`61`	`return sprintf('%.2f%%', $instructionDiff / $baseInstructions * 100);`
`61`	`62`	`}`
`62`	`63`
	`64`	`+function find_benchmarked_commit_hash(string $repo, string $commitHash): ?string {`
	`65`	`+ $repeat = 10;`
	`66`	`+`
	`67`	`+ while (true) {`
	`68`	`+ if ($repeat-- <= 0) {`
	`69`	`+ fwrite(STDERR, "Count not find benchmarked commit hash\n");`
	`70`	`+ exit(1);`
	`71`	`+ }`
	`72`	`+ $summaryFile = $repo . '/' . substr($commitHash, 0, 2) . '/' . $commitHash . '/summary.json';`
	`73`	`+ if (file_exists($summaryFile)) {`
	`74`	`+ break;`
	`75`	`+ }`
	`76`	`+ $commitHash = trim(runCommand(['git', 'rev-parse', $commitHash . '^'], dirname(__DIR__))->stdout);`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ return $commitHash;`
	`80`	`+}`
	`81`	`+`
`63`	`82`	`$headCommitHash = $argv[1] ?? null;`
`64`	`83`	`$baseCommitHash = $argv[2] ?? null;`
`65`	`84`	`$output = main($headCommitHash, $baseCommitHash);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f994c2f

File tree

1 file changed

1 file changed

`‎benchmark/generate_diff.php‎`

0 commit comments