Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
Poulpe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
octobus
Poulpe
Commits
cad83f54
Commit
cad83f54
authored
2 years ago
by
Pierre-Yves David
Browse files
Options
Downloads
Patches
Plain Diff
hg-perf: check delta timing for some merge too
parent
3e5cfc11
No related branches found
No related tags found
1 merge request
!16
perf-delta-find
Pipeline
#56755
passed
2 years ago
Stage: test
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
suites/hg/benchmarks/perf-delta-find.pbd
+15
-0
15 additions, 0 deletions
suites/hg/benchmarks/perf-delta-find.pbd
suites/hg/setup-data/setup-55-delta-chain.py
+24
-4
24 additions, 4 deletions
suites/hg/setup-data/setup-55-delta-chain.py
tests/test-data-setup.t
+7
-0
7 additions, 0 deletions
tests/test-data-setup.t
with
46 additions
and
4 deletions
suites/hg/benchmarks/perf-delta-find.pbd
+
15
−
0
View file @
cad83f54
...
...
@@ -55,3 +55,18 @@
[hg-perf-ext.variants.dimensions.rev.manifest-snapshot-many-both-e]
args=["--manifest", "DATA-VARS:mercurial.revlog.delta-find.manifest.snapshot.many-both.e"]
[hg-perf-ext.variants.dimensions.rev.manifest-merge-long-chain-both-a]
args=["--manifest", "DATA-VARS:mercurial.revlog.delta-find.manifest.merge.long-chain-both.a"]
[hg-perf-ext.variants.dimensions.rev.manifest-merge-long-chain-both-b]
args=["--manifest", "DATA-VARS:mercurial.revlog.delta-find.manifest.merge.long-chain-both.b"]
[hg-perf-ext.variants.dimensions.rev.manifest-merge-long-chain-both-c]
args=["--manifest", "DATA-VARS:mercurial.revlog.delta-find.manifest.merge.long-chain-both.c"]
[hg-perf-ext.variants.dimensions.rev.manifest-merge-long-chain-both-d]
args=["--manifest", "DATA-VARS:mercurial.revlog.delta-find.manifest.merge.long-chain-both.d"]
[hg-perf-ext.variants.dimensions.rev.manifest-merge-long-chain-both-e]
args=["--manifest", "DATA-VARS:mercurial.revlog.delta-find.manifest.merge.long-chain-both.e"]
This diff is collapsed.
Click to expand it.
suites/hg/setup-data/setup-55-delta-chain.py
+
24
−
4
View file @
cad83f54
...
...
@@ -36,5 +36,8 @@
proc
.
check_returncode
()
delta_chain_data
=
json
.
loads
(
proc
.
stdout
)
all_data
=
{}
all_info
=
{}
all_snap
=
{}
all_merge
=
[]
...
...
@@ -40,3 +43,3 @@
target_type
=
(
'
base
'
,
'
snap
'
)
target_type
=
(
'
base
'
,
'
snap
'
)
for
rev_info
in
delta_chain_data
:
...
...
@@ -42,4 +45,7 @@
for
rev_info
in
delta_chain_data
:
all_info
[
rev_info
[
'
rev
'
]]
=
rev_info
if
rev_info
[
'
p1
'
]
!=
-
1
and
rev_info
[
'
p2
'
]
!=
-
1
:
all_merge
.
append
(
rev_info
)
if
rev_info
[
'
deltatype
'
]
not
in
target_type
:
continue
...
...
@@ -74,5 +80,5 @@
data
[
k
]
=
v
break
if
data
is
not
None
:
all_
data
[
rev_info
[
'
rev
'
]]
=
data
all_
snap
[
rev_info
[
'
rev
'
]]
=
data
...
...
@@ -78,5 +84,5 @@
items
=
list
(
all_
data
.
items
())
items
=
list
(
all_
snap
.
items
())
def
set_one
(
key
,
value
):
...
...
@@ -110,3 +116,17 @@
for
i
,
r
in
enumerate
(
max_combined
):
c
=
chr
(
ord
(
'
a
'
)
+
i
)
set_one
(
f
'
snapshot.many-both.
{
c
}
'
,
r
[
0
])
# search merges listing on the longest chain for parent
def
key
(
i
):
p1_len
=
all_info
[
i
[
'
p1
'
]][
'
chainlen
'
]
p2_len
=
all_info
[
i
[
'
p2
'
]][
'
chainlen
'
]
return
(
min
(
p1_len
,
p2_len
),
max
(
p1_len
,
p2_len
),
i
[
'
rev
'
])
all_merge
.
sort
(
key
=
key
)
max_merge
=
all_merge
[:
-
6
:
-
1
]
for
i
,
r
in
enumerate
(
max_merge
):
c
=
chr
(
ord
(
'
a
'
)
+
i
)
set_one
(
f
'
merge.long-chain-both.
{
c
}
'
,
r
[
'
rev
'
])
This diff is collapsed.
Click to expand it.
tests/test-data-setup.t
+
7
−
0
View file @
cad83f54
...
...
@@ -43,6 +43,13 @@
revlog:
delta
-
find:
manifest:
merge:
long
-
chain
-
both:
a
=
11790
b
=
9480
c
=
8398
d
=
4851
e
=
2487
snapshot:
many
-
both:
a
=
8152
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment