Skip to content

compare-perf: Add support for selecting a single run as input #3821

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
merged 3 commits into from
Nov 15, 2024
Merged

compare-perf: Add support for selecting a single run as input #3821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e55ce0e
compare-perf: Add support for selecting a single run as input
tausbn Nov 14, 2024
73a865d
Simplify view when not in comparison mode
tausbn Nov 15, 2024
b862d14
Remove redundant check
tausbn Nov 15, 2024
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
1 change: 1 addition & 0 deletions extensions/ql-vscode/src/common/interface-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ export interface SetPerformanceComparisonQueries {
readonly t: "setPerformanceComparison";
readonly from: PerformanceComparisonDataFromLog;
readonly to: PerformanceComparisonDataFromLog;
readonly comparison: boolean;
}

export type FromComparePerformanceViewMessage = CommonFromViewMessages;
Expand Down
1 change: 1 addition & 0 deletions extensions/ql-vscode/src/compare-performance/compare-performance-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export class ComparePerformanceView extends AbstractWebview<
t: "setPerformanceComparison",
from: fromPerf.getData(),
to: toPerf.getData(),
comparison: fromJsonLog !== "",
});
}

Expand Down
70 changes: 47 additions & 23 deletions extensions/ql-vscode/src/view/compare-performance/ComparePerformance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,15 @@ const Dropdown = styled.select``;
interface PipelineStepProps {
before: number | undefined;
after: number | undefined;
comparison: boolean;
step: React.ReactNode;
}

/**
* Row with details of a pipeline step, or one of the high-level stats appearing above the pipelines (evaluation/iteration counts).
*/
function PipelineStep(props: PipelineStepProps) {
let { before, after, step } = props;
let { before, after, comparison, step } = props;
if (before != null && before < 0) {
before = undefined;
}
Expand All @@ -236,9 +237,11 @@ function PipelineStep(props: PipelineStepProps) {
return (
<PipelineStepTR>
<ChevronCell />
<NumberCell>{before != null ? formatDecimal(before) : ""}</NumberCell>
{comparison && (
<NumberCell>{before != null ? formatDecimal(before) : ""}</NumberCell>
)}
<NumberCell>{after != null ? formatDecimal(after) : ""}</NumberCell>
{delta != null ? renderDelta(delta) : <td></td>}
{comparison && (delta != null ? renderDelta(delta) : <td></td>)}
<NameCell>{step}</NameCell>
</PipelineStepTR>
);
Expand All @@ -251,10 +254,11 @@ const HeaderTR = styled.tr`
interface HighLevelStatsProps {
before: PredicateInfo;
after: PredicateInfo;
comparison: boolean;
}

function HighLevelStats(props: HighLevelStatsProps) {
const { before, after } = props;
const { before, after, comparison } = props;
const hasBefore = before.absentReason !== AbsentReason.NotSeen;
const hasAfter = after.absentReason !== AbsentReason.NotSeen;
const showEvaluationCount =
Expand All @@ -263,21 +267,25 @@ function HighLevelStats(props: HighLevelStatsProps) {
<>
<HeaderTR>
<ChevronCell></ChevronCell>
<NumberHeader>{hasBefore ? "Before" : ""}</NumberHeader>
{comparison && <NumberHeader>{hasBefore ? "Before" : ""}</NumberHeader>}
<NumberHeader>{hasAfter ? "After" : ""}</NumberHeader>
<NumberHeader>{hasBefore && hasAfter ? "Delta" : ""}</NumberHeader>
{comparison && (
<NumberHeader>{hasBefore && hasAfter ? "Delta" : ""}</NumberHeader>
)}
<NameHeader>Stats</NameHeader>
</HeaderTR>
{showEvaluationCount && (
<PipelineStep
before={before.evaluationCount || undefined}
after={after.evaluationCount || undefined}
comparison={comparison}
step="Number of evaluations"
/>
)}
<PipelineStep
before={before.iterationCount / before.evaluationCount || undefined}
after={after.iterationCount / after.evaluationCount || undefined}
comparison={comparison}
step={
showEvaluationCount
? "Number of iterations per evaluation"
Expand Down Expand Up @@ -379,6 +387,8 @@ function ComparePerformanceWithData(props: {
[data],
);

const comparison = data?.comparison;

const [expandedPredicates, setExpandedPredicates] = useState<Set<string>>(
() => new Set<string>(),
);
Expand Down Expand Up @@ -480,9 +490,9 @@ function ComparePerformanceWithData(props: {
<thead>
<HeaderTR>
<ChevronCell />
<NumberHeader>Before</NumberHeader>
<NumberHeader>After</NumberHeader>
<NumberHeader>Delta</NumberHeader>
{comparison && <NumberHeader>Before</NumberHeader>}
<NumberHeader>{comparison ? "After" : "Value"}</NumberHeader>
{comparison && <NumberHeader>Delta</NumberHeader>}
<NameHeader>Predicate</NameHeader>
</HeaderTR>
</thead>
Expand All @@ -505,33 +515,44 @@ function ComparePerformanceWithData(props: {
<ChevronCell>
<Chevron expanded={expandedPredicates.has(row.name)} />
</ChevronCell>
{renderAbsoluteValue(row.before, metric)}
{comparison && renderAbsoluteValue(row.before, metric)}
{renderAbsoluteValue(row.after, metric)}
{renderDelta(row.diff, metric.unit)}
{comparison && renderDelta(row.diff, metric.unit)}
<NameCell>{rowNames[rowIndex]}</NameCell>
</PredicateTR>
{expandedPredicates.has(row.name) && (
<>
<HighLevelStats before={row.before} after={row.after} />
<HighLevelStats
before={row.before}
after={row.after}
comparison={comparison}
/>
{collatePipelines(
row.before.pipelines,
row.after.pipelines,
).map(({ name, first, second }, pipelineIndex) => (
<Fragment key={pipelineIndex}>
<HeaderTR>
<td></td>
<NumberHeader>{first != null && "Before"}</NumberHeader>
{comparison && (
<NumberHeader>{first != null && "Before"}</NumberHeader>
)}
<NumberHeader>{second != null && "After"}</NumberHeader>
<NumberHeader>
{first != null && second != null && "Delta"}
</NumberHeader>
{comparison && (
<NumberHeader>
{first != null &&
second != null &&
(comparison ? "Delta" : "Value")}
</NumberHeader>
)}
Copy link
Contributor

@asgerf asgerf Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we hide Delta and do comparison ? "After" : "Value" instead?

Copy link
Contributor

@asgerf asgerf Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it amounts to the same if it's only done in the header, it just looks weird 🤔

Copy link
Contributor

@asgerf asgerf Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the check on comparison is dead as it's inside another check for comparison

Copy link
Contributor Author

@tausbn tausbn Nov 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops! You're completely right. Brain was on autopilot.

<NameHeader>
Tuple counts for &apos;{name}&apos; pipeline
{first == null
? " (after)"
: second == null
? " (before)"
: ""}
{comparison &&
(first == null
? " (after)"
: second == null
? " (before)"
: "")}
</NameHeader>
</HeaderTR>
{abbreviateRASteps(first?.steps ?? second!.steps).map(
Expand All @@ -540,6 +561,7 @@ function ComparePerformanceWithData(props: {
key={index}
before={first?.counts[index]}
after={second?.counts[index]}
comparison={comparison}
step={step}
/>
),
Expand All @@ -558,9 +580,11 @@ function ComparePerformanceWithData(props: {
</tr>
<tr key="total">
<ChevronCell />
<NumberCell>{formatDecimal(totalBefore)}</NumberCell>
{comparison && (
<NumberCell>{formatDecimal(totalBefore)}</NumberCell>
)}
<NumberCell>{formatDecimal(totalAfter)}</NumberCell>
{renderDelta(totalDiff)}
{comparison && renderDelta(totalDiff)}
<NameCell>TOTAL</NameCell>
</tr>
</tfoot>
Expand Down
Loading