Skip to content
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.

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

Write replay measurements into a JSON file - Finalised #1280

Merged

Conversation

andrew-lunarg
Copy link
Contributor

PR #1175 was merged with dev, mixing commits into the history and creating a merge commit, which we do not do. I would have had to rewrite history to do the required rebase and push to the original branch which I don't want to do so I made a fresh PR for the final rebase on dev. There were also a couple of small changes, one of which needed my knowledge of upcoming changes to the codebase so I went ahead and made them myself.

@ci-tester-lunarg
Copy link

CI gfxreconstruct build queued with queue ID 50786.

@marius-pelegrin-arm
Copy link
Contributor

Arf, so sorry, and I did the same mistake with #1276
Is there a way for me to fix this for this other PR ?

@ci-tester-lunarg
Copy link

CI gfxreconstruct build # 3278 running.

marius-pelegrin-arm and others added 2 commits September 27, 2023 16:19
Marius measurements-file diffed against dev

Branch pushed to PR was merged with dev rather than rebased on top of
it so I diffed that branch against dev to make a commit equivalent to
rebasing and squashing it - Andrew.

Results from `--measurement-frame-range` can now be written to a JSON
file using the option `--measurement-file`.

This option is necessary to retrieve measurements in android
environments where logcat is not available. It also makes parsing
of the measurements by a script easier and allow more detailed
measurements without flooding the logcat.

Example of JSON output:

{
    "application": {
        "capture_name": "/sdcard/capture.gfxr"
    },
    "frame_range":
    {
        "duration": 2.365642154,
        "end_frame": 200,
        "end_time_monotonic": 15666.74495701,
        "fps": 42.27182028816688,
        "frame_count": 100,
        "frame_durations": [
            17316846,
            26862231,
            24499077,
            24042769,

            ...

            19480077,
            16187384,
            16081154,
            18678846,
            18439692
        ],
        "start_frame": 100,
        "start_time_monotonic": 15664.379314856
    }
}

Co-authored-by: Andrew Cox <andrew@lunarg.com>
@andrew-lunarg andrew-lunarg force-pushed the andy-finalise-measurements-file branch from c71f835 to e42b57c Compare September 27, 2023 15:20
@ci-tester-lunarg
Copy link

CI gfxreconstruct build queued with queue ID 50804.

@andrew-lunarg
Copy link
Contributor Author

Is there a way for me to fix this for this other PR ?
If you know the commit ID before the merge you can reset your branch's head to that. E.g. if you made a tag before merging as a backup.

I did something like this to get a fresh new branch with your changes as a single commit after the head of dev:

git diff dev yourbranch > patch.diff
git checkout dev
git checkout -b fresh_branch
git apply patch.diff

@ci-tester-lunarg
Copy link

CI gfxreconstruct build # 3279 running.

@andrew-lunarg andrew-lunarg merged commit e2ca5a6 into LunarG:dev Sep 27, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants