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.

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

Jump to bottom

gapit: Add OutputCSV flag to benchmark (#2540). #2573

Merged
merged 3 commits into from Feb 1, 2019
Merged

gapit: Add OutputCSV flag to benchmark (#2540). #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fffdab
gapit: Add OutputCSV flag to benchmark (#2540).
pau-baiget Jan 29, 2019
b203af5
Remove defer and place flush at the proper place
pau-baiget Jan 31, 2019
d2007e0
Fix code style
pau-baiget Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
78 changes: 51 additions & 27 deletions cmd/gapit/benchmark.go
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ package main
import (
"bytes"
"context"
"encoding/csv"
"encoding/json"
"flag"
"fmt"
Expand Down Expand Up @@ -511,9 +512,9 @@ func (verb *benchmarkVerb) Run(ctx context.Context, flags flag.FlagSet) error {
for _, types := range resources.GetTypes() {
for ii, v := range types.GetResources() {
if (types.Type == api.ResourceType_TextureResource ||
types.Type == api.ResourceType_ShaderResource ||
types.Type == api.ResourceType_ProgramResource) &&
ii < 30 {
types.Type == api.ResourceType_ShaderResource ||
types.Type == api.ResourceType_ProgramResource) &&
ii < 30 {
gotResources.Add(1)
go func(id *path.ID) {
defer gotResources.Done()
Expand Down Expand Up @@ -585,34 +586,57 @@ func (verb *benchmarkVerb) Run(ctx context.Context, flags flag.FlagSet) error {

ctx = oldCtx
writeOutput := func() {
w := tabwriter.NewWriter(os.Stdout, 4, 4, 3, ' ', 0)
fmt.Fprintln(w, "Trace Time\tTrace Size\tTrace Frames\tState Serialization\tTrace Frame Time\tInteractive")
fmt.Fprintln(w, "----------\t----------\t------------\t-------------------\t----------------\t-----------")
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\n",
verb.traceDoneTime.Sub(verb.beforeStartTraceTime),
verb.traceSizeInBytes,
verb.traceFrames,
time.Duration(stateTime)*time.Nanosecond,
time.Duration(frameTime)*time.Nanosecond,
verb.gapisInteractiveTime.Sub(verb.traceDoneTime),
)
w.Flush()
preMecFramerate := float64(stateBuildStartTime - traceStartTimestamp)
if verb.StartFrame > 0 {
preMecFramerate = preMecFramerate / float64(verb.StartFrame)
}
fmt.Fprintln(os.Stdout, "")
w = tabwriter.NewWriter(os.Stdout, 4, 4, 3, ' ', 0)
fmt.Fprintln(w, "Caching Done\tInteraction\tMax Memory\tBefore MEC Frame Time\tTrailing Frame Time")
fmt.Fprintln(w, "------------\t-----------\t----------\t---------------------\t-----------------")
fmt.Fprintf(w, "%+v\t%+v\t%+v\t%+v\t%+v\n",
verb.gapisCachingDoneTime.Sub(verb.traceDoneTime),
verb.interactionDoneTime.Sub(verb.interactionStartTime),
traceMaxMemory,
time.Duration(preMecFramerate)*time.Nanosecond,
time.Duration(nonLoadingFrameTime)*time.Nanosecond,
)
w.Flush()
if verb.OutputCSV {
csvWriter := csv.NewWriter(os.Stdout)
header := []string{
"Trace Time (ms)", "Trace Size", "Trace Frames", "State Serialization (ms)", "Trace Frame Time (ms)", "Interactive (ms)",
"Caching Done (ms)", "Interaction (ms)", "Max Memory", "Before MEC Frame Time (ms)", "Trailing Frame Time (ms)"}
csvWriter.Write(header)
record := []string{
fmt.Sprint(float64(verb.traceDoneTime.Sub(verb.beforeStartTraceTime).Nanoseconds()) / float64(time.Millisecond)),
fmt.Sprint(verb.traceSizeInBytes),
fmt.Sprint(verb.traceFrames),
fmt.Sprint(stateTime / float64(time.Millisecond)),
fmt.Sprint(frameTime / float64(time.Millisecond)),
fmt.Sprint(float64(verb.gapisInteractiveTime.Sub(verb.traceDoneTime).Nanoseconds()) / float64(time.Millisecond)),
fmt.Sprint(float64(verb.gapisCachingDoneTime.Sub(verb.traceDoneTime).Nanoseconds()) / float64(time.Millisecond)),
fmt.Sprint(float64(verb.interactionDoneTime.Sub(verb.interactionStartTime).Nanoseconds()) / float64(time.Millisecond)),
fmt.Sprint(traceMaxMemory),
fmt.Sprint(preMecFramerate / float64(time.Millisecond)),
fmt.Sprint(float64(nonLoadingFrameTime) / float64(time.Millisecond)),
}
csvWriter.Write(record)
csvWriter.Flush()
} else {
w := tabwriter.NewWriter(os.Stdout, 4, 4, 3, ' ', 0)
fmt.Fprintln(w, "Trace Time\tTrace Size\tTrace Frames\tState Serialization\tTrace Frame Time\tInteractive")
fmt.Fprintln(w, "----------\t----------\t------------\t-------------------\t----------------\t-----------")
fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\t%v\n",
verb.traceDoneTime.Sub(verb.beforeStartTraceTime),
verb.traceSizeInBytes,
verb.traceFrames,
time.Duration(stateTime)*time.Nanosecond,
time.Duration(frameTime)*time.Nanosecond,
verb.gapisInteractiveTime.Sub(verb.traceDoneTime),
)
w.Flush()
fmt.Fprintln(os.Stdout, "")
w = tabwriter.NewWriter(os.Stdout, 4, 4, 3, ' ', 0)
fmt.Fprintln(w, "Caching Done\tInteraction\tMax Memory\tBefore MEC Frame Time\tTrailing Frame Time")
fmt.Fprintln(w, "------------\t-----------\t----------\t---------------------\t-----------------")
fmt.Fprintf(w, "%+v\t%+v\t%+v\t%+v\t%+v\n",
verb.gapisCachingDoneTime.Sub(verb.traceDoneTime),
verb.interactionDoneTime.Sub(verb.interactionStartTime),
traceMaxMemory,
time.Duration(preMecFramerate)*time.Nanosecond,
time.Duration(nonLoadingFrameTime)*time.Nanosecond,
)
w.Flush()
}
}

writeTrace = func(path string, gapisTrace, gapitTrace *bytes.Buffer) error {
Expand Down
1 change: 1 addition & 0 deletions cmd/gapit/flags.go
View file
Open in desktop
Expand Up @@ -266,6 +266,7 @@ type (
DumpTrace string `help:"dump a systrace of gapis"`
StartFrame int `help:"perform a MEC trace starting at this frame"`
NoOpt bool `help:"disables optimization of the replay stream"`
OutputCSV bool `help:"outputs data in CSV-friendly format"`
}

StatusFlags struct {
Expand Down