Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Iris
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
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Abel Nieto
Iris
Commits
3b9762bb
Commit
3b9762bb
authored
6 years ago
by
Ralf Jung
Browse files
Options
Downloads
Patches
Plain Diff
explain how to time a change against a reverse dependency
parent
f31dc3c7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CONTRIBUTING.md
+59
-8
59 additions, 8 deletions
CONTRIBUTING.md
with
59 additions
and
8 deletions
CONTRIBUTING.md
+
59
−
8
View file @
3b9762bb
# Contributing to the Iris Coq Development
Here you can find some how-tos for various thing sthat might come up when doing
Iris development.
## How to submit a merge request
To contribute code, you need an
[
MPI-SWS GitLab account
](
https://gitlab.mpi-sws.org/users/sign_in
)
(
use
the
"Register" tab). Please send your MPI-SWS GitLab username to
[
Ralf Jung
](
https://gitlab.mpi-sws.org/jung
)
to enable personal projects for
your account. Then you can fork the
[
Iris git repository
](
https://gitlab.mpi-sws.org/iris/iris/
)
, make your
changes in your fork, and create a merge request.
To contribute code, you need an
[
MPI-SWS GitLab account
][
account
]
(use the
"Register" tab). Please send your MPI-SWS GitLab username to
[
Ralf Jung
][
jung
]
to enable personal projects for your account. Then you can fork the
[
Iris git repository
][
iris
]
, make your changes in your fork, and create a merge
request.
Please do
*not*
use the master branch of your fork, that might confuse CI. Use
a feature branch instead.
[
account
]:
https://gitlab.mpi-sws.org/users/sign_in
[
jung
]:
https://gitlab.mpi-sws.org/jung
[
iris
]:
https://gitlab.mpi-sws.org/iris/iris
## How to update the std++ dependency
*
Do the change in std++, push it.
...
...
@@ -29,10 +34,56 @@ The files in `tests/` are test cases. Each of the `.v` files comes with a
matching
`.ref`
file containing the expected output of
`coqc`
. Adding
`Show.`
in selected places in the proofs makes
`coqc`
print the current goal state.
This is used to make sure the proof mode prints goals and reduces terms the way
we expect it to. You can run
`MAKE_REF=1
make
`
to re-generate all the
`.ref`
files;
we expect it to. You can run
`
make
MAKE_REF=1`
to re-generate all the
`.ref`
files;
this is useful after adding or removing
`Show.`
from a test. If you do this,
make sure to check the diff for any unexpected changes in the output!
Some test cases have per-Coq-version
`.ref`
files (e.g.,
`atomic.8.8.ref`
is a
Coq-8.8-specific
`.ref`
file). If you change one of these, remember to update
*all*
the
`.ref`
files.
## How to measure the timing effect on a reverse dependency
So say you did a change in Iris, and want to know how it affects [lambda-rust]
or the [examples]. To do this, check out the respective project and change its
`.gitlab-ci.yml`
to contain only one build job, which should look like
```
build-iris.dev:
<<: *template
variables:
OPAM_PINS: "coq version 8.9.0 coq-iris.dev git git+https://gitlab.mpi-sws.org/FP/iris-coq.git#yourname/feature"
TIMING_CONF: "coq-8.9.0"
tags:
- fp-timing
```
You will have to adjust this a bit: you should use the same Coq version as
whatever the master branch uses for its timing job, which you can determine by
checking its
`.gitlab-ci.yml`
. If you change the Coq version, remember to do it
in both places (
`OPAM_PINS`
and
`TIMING_CONF`
). You will also have to adjust
the Iris branch being used, which is determined after the
`#`
in
`OPAM_PINS`
.
If you are in doubt, ask on Mattermost
*before*
pushing your branch.
Once you are confident with your CI configuration, push this to a new branch
whose name starts with
`ci/`
. It should usually be of the form
`ci/yourname/feature`
. You should see a pipeline running in GitLab with just a
single job, and you can follow its progress there.
When the job is done, you should be able to see it as a single dot on our
[
statistics server
][
coq-speed
]
after selecting the right project and branch.
Click on "Coq-Speed" on the top-left corner to switch to another dashboard, and
select "Coq-Compare". Now you can select the project and the two measurements
you want to compare, which would be the SHA of the commit you just created as
"Commit 2", and the SHA of its parent as "Commit 1". Don't forget to also
select the right configuration for both of them. The "Grouping" is a regular
expression that you can use to switch between per-file, per-directory and
per-project grouping of the measurements.
If you changed your Iris branch and want to make another measurement,
*do not*
just "Retry" the CI job. That will lead to an error, because you would end up
with two measurements for the same commit. Instead, create an empty commit in
your branch of the to-be-measured project (
`git commit --allow-empty -m
"rerun"`
), and push that.
[
lambda-rust
]:
https://gitlab.mpi-sws.org/iris/lambda-rust
[
examples
]:
https://gitlab.mpi-sws.org/iris/examples
[
coq-speed
]:
https://coq-speed.mpi-sws.org
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