Sitelet https://github.com/phpbench/phpbench/pull/1154/files
Skip to content

Do not show "ERR" if baseline not there #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dantleech merged 1 commit into from
Jun 14, 2026
Merged

Do not show "ERR" if baseline not there #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CHANGELOG
=========

master
------

- Conditionally show the baseline "difference" in the default expression
report. #1154 @dantleech

1.7.0
-----

Expand Down
33 changes: 28 additions & 5 deletions lib/Report/Generator/ExpressionGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ class ExpressionGenerator implements GeneratorInterface
final public const PARAM_INCLUDE_BASELINE = 'include_baseline';
final public const PARAM_DERIVATIONS = 'derivations';

public function __construct(private readonly ExpressionEvaluator $evaluator, private readonly SuiteCollectionTransformer $transformer, private readonly LoggerInterface $logger)
{
public function __construct(
private readonly ExpressionEvaluator $evaluator,
private readonly SuiteCollectionTransformer $transformer,
private readonly LoggerInterface $logger
) {
}

/**
Expand Down Expand Up @@ -82,6 +85,7 @@ public function configure(OptionsResolver $options): void
$options->setAllowedTypes(self::PARAM_AGGREGATE, 'array');
$options->setAllowedTypes(self::PARAM_BREAK, 'array');
$options->setAllowedTypes(self::PARAM_INCLUDE_BASELINE, 'bool');

$options->setNormalizer(self::PARAM_EXPRESSIONS, function (Options $options, array $expressions) use ($formatTime) {
return array_merge([
'tag' => 'first(suite_tag)',
Expand Down Expand Up @@ -109,12 +113,30 @@ public function configure(OptionsResolver $options): void
), E_USER_DEPRECATED);
}

$baselineExpr = function (string $primaryExpr, string $baselineExpr) {
return sprintf(
'%s ~ if(%s," " ~ %s, "")',
$primaryExpr,
'first(has_baseline) = true',
$baselineExpr
);
};

return array_merge([
'best' => $formatTime('min(result_time_avg)'),
'worst' => $formatTime('max(result_time_avg)'),
'mode' => $formatTime('mode(result_time_avg)') . ' ~" "~ percent_diff(mode(baseline_time_avg), mode(result_time_avg), rstdev(result_time_avg))',
'mem_peak' => '(first(baseline_mem_peak) as memory) ~ " " ~ percent_diff(first(baseline_mem_peak), first(result_mem_peak))',
'rstdev' => 'rstdev(result_time_avg) ~ " " ~ percent_diff(rstdev(baseline_time_avg), rstdev(result_time_avg))',
'mode' => $baselineExpr(
$formatTime('mode(result_time_avg)'),
'percent_diff(mode(baseline_time_avg), mode(result_time_avg), rstdev(result_time_avg))',
),
'mem_peak' => $baselineExpr(
'first(result_mem_peak) as memory',
'percent_diff(first(baseline_mem_peak), first(result_mem_peak))'
),
'rstdev' => $baselineExpr(
'rstdev(result_time_avg)',
'percent_diff(rstdev(baseline_time_avg), rstdev(result_time_avg))',
),
], $expressions);
});
$options->setNormalizer(self::PARAM_COLS, function (Options $options, ?array $cols) {
Expand All @@ -127,6 +149,7 @@ public function configure(OptionsResolver $options): void

return array_keys($expressions);
});

SymfonyOptionsResolverCompat::setInfos($options, [
self::PARAM_TITLE => 'Title to use for report',
self::PARAM_DESCRIPTION => 'Description to use for report',
Expand Down
30 changes: 30 additions & 0 deletions tests/Unit/Report/Generator/expression/cols-baseline-not-existing-for-new-subject
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"baseline": {
"subjects": [
"one"
],
"iterations": [
10,
20
]
},
"subjects": [
"one",
"two"
],
"iterations": [
10
]
}
---
{
"cols": ["mem_peak", "best", "mode", "mean", "worst", "stdev", "rstdev"]
}
---
+------------+----------+------------------+----------+----------+---------+-----------------+
| mem_peak | best | mode | mean | worst | stdev | rstdev |
+------------+----------+------------------+----------+----------+---------+-----------------+
| 200b 0.00% | 10.000μs | 10.000μs -33.38% | 10.000μs | 10.000μs | 0.000μs | ±0.00% -100.00% |
| 200b | 10.000μs | 10.000μs | 10.000μs | 10.000μs | 0.000μs | ±0.00% |
+------------+----------+------------------+----------+----------+---------+-----------------+

Loading