Perf - Fixups for androidx.
All the little things that needed to be fixed.
Bug: skia:9315
Change-Id: Ia847bc142cdb70fcb24dbb95e655fd7590919e9a
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/233166
Commit-Queue: Joe Gregorio <jcgregorio@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/go/ds/ds.go b/go/ds/ds.go
index 94fe4ff..0378b0a 100644
--- a/go/ds/ds.go
+++ b/go/ds/ds.go
@@ -90,6 +90,7 @@
// Perf
PERF_NS = "perf"
PERF_ANDROID_NS = "perf-android"
+ PERF_ANDROID_X_NS = "perf-android-x"
PERF_ANDROID_MASTER_NS = "perf-androidmaster"
PERF_CT_NS = "perf-ct"
@@ -131,6 +132,7 @@
AUTOROLL_INTERNAL_NS: {KIND_AUTOROLL_MODE, KIND_AUTOROLL_MODE_ANCESTOR, KIND_AUTOROLL_ROLL, KIND_AUTOROLL_ROLL_ANCESTOR, KIND_AUTOROLL_STATUS, KIND_AUTOROLL_STATUS_ANCESTOR, KIND_AUTOROLL_STRATEGY, KIND_AUTOROLL_STRATEGY_ANCESTOR, KIND_AUTOROLL_UNTHROTTLE, KIND_AUTOROLL_UNTHROTTLE_ANCESTOR},
PERF_NS: {ACTIVITY, ALERT, REGRESSION, SHORTCUT},
PERF_ANDROID_NS: {ACTIVITY, ALERT, REGRESSION, SHORTCUT},
+ PERF_ANDROID_X_NS: {ACTIVITY, ALERT, REGRESSION, SHORTCUT},
PERF_ANDROID_MASTER_NS: {ACTIVITY, ALERT, REGRESSION, SHORTCUT},
PERF_CT_NS: {ACTIVITY, ALERT, REGRESSION, SHORTCUT},
GOLD_CHROMEVR_NS: goldKinds,
diff --git a/perf/elements.html b/perf/elements.html
index 82bebfd..6d5c63e 100644
--- a/perf/elements.html
+++ b/perf/elements.html
@@ -14,10 +14,7 @@
<link href="/res/imp/bower_components/paper-spinner/paper-spinner.html" rel="import">
<link href="/res/common/imp/commit-panel.html" rel="import" />
- <link href="/res/common/imp/error-toast-sk.html" rel="import" />
- <link href="/res/common/imp/sort.html" rel="import" />
- <link href="/res/imp/cluster-page.html" rel="import" />
<link href="/res/imp/triage-page.html" rel="import" />
<link href="/res/imp/cluster-lastn-page.html" rel="import" />
</head>
diff --git a/perf/go/config/config.go b/perf/go/config/config.go
index 7556b17..5350915 100644
--- a/perf/go/config/config.go
+++ b/perf/go/config/config.go
@@ -83,7 +83,7 @@
GitUrl: "https://skia.googlesource.com/perf-buildid/android-master",
Shards: 8,
Sources: []string{"gs://skia-perf/android-master-ingest"},
- Branches: []string{"aosp-androidx-master-dev branch"},
+ Branches: []string{"aosp-androidx-master-dev"},
},
}
)
diff --git a/perf/go/perf-ingest/main.go b/perf/go/perf-ingest/main.go
index a73c357..5251e47 100644
--- a/perf/go/perf-ingest/main.go
+++ b/perf/go/perf-ingest/main.go
@@ -143,13 +143,20 @@
if branch, ok := benchData.Key["branch"]; ok {
if len(branches) > 0 {
if !util.In(branch, branches) {
- sklog.Infof("Skipping branch: %q", branch)
return nil
}
}
+ } else {
+ sklog.Infof("No branch name.")
}
params, values, paramset := getParamsAndValues(benchData)
+ // Don't do any more work if there's no data to ingest.
+ if len(params) == 0 {
+ sklog.Infof("No data in: %q", filename)
+ return nil
+ }
+ sklog.Infof("Processing %q", filename)
index, ok := indexFromCache(benchData.Hash)
if !ok {
var err error
@@ -270,6 +277,11 @@
sklog.Error(err)
return
}
+ // Transaction logs for android_ingest are written to the same bucket,
+ // which we should ignore.
+ if strings.Contains(event.Name, "/tx_log/") {
+ return
+ }
// Load the file.
obj := gcsClient.Bucket(event.Bucket).Object(event.Name)
attrs, err := obj.Attrs(ctx)
@@ -283,7 +295,7 @@
return
}
defer util.Close(reader)
- sklog.Info(attrs.Name)
+ sklog.Infof("Filename: %q", attrs.Name)
// Pull data out of file and write it into BigTable.
fullName := fmt.Sprintf("gs://%s/%s", event.Bucket, event.Name)
err = processSingleFile(ctx, store, vcs, fullName, reader, attrs.Created, cfg.Branches)
diff --git a/perf/go/skiaperf/main.go b/perf/go/skiaperf/main.go
index 3912225..1bd4507 100644
--- a/perf/go/skiaperf/main.go
+++ b/perf/go/skiaperf/main.go
@@ -252,7 +252,7 @@
if *namespace == "" {
sklog.Fatal("The --namespace flag is required. See infra/DATASTORE.md for format details.\n")
}
- if !*local && !util.In(*namespace, []string{ds.PERF_NS, ds.PERF_ANDROID_NS, ds.PERF_ANDROID_MASTER_NS, ds.PERF_CT_NS}) {
+ if !*local && !util.In(*namespace, []string{ds.PERF_NS, ds.PERF_ANDROID_NS, ds.PERF_ANDROID_X_NS, ds.PERF_ANDROID_MASTER_NS, ds.PERF_CT_NS}) {
sklog.Fatal("When running in prod the datastore namespace must be a known value.")
}
diff --git a/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.js b/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.js
index df0a678..88c7c08 100644
--- a/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.js
+++ b/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.js
@@ -38,7 +38,7 @@
const template = (ele) => html`
<button @click=${ele._open}>${_titleFrom(ele)}</button>
- <dialog-sk>
+ <dialog>
<commit-detail-panel-sk @commit-selected='${ele._panelSelect}' .details='${ele._details}' selectable selected=${ele.selected}></commit-detail-panel-sk>
<button @click=${ele._close}>Close</button>
</dialog>
diff --git a/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.scss b/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.scss
index 3adccae..ef6d2c4 100644
--- a/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.scss
+++ b/perf/modules/commit-detail-picker-sk/commit-detail-picker-sk.scss
@@ -1,5 +1,5 @@
commit-detail-picker-sk {
- dialog-sk button {
+ dialog button {
float: right;
margin-top: 1em;
}
diff --git a/perf/modules/domain-picker-sk/domain-picker-sk.scss b/perf/modules/domain-picker-sk/domain-picker-sk.scss
index 9510245..851db24 100644
--- a/perf/modules/domain-picker-sk/domain-picker-sk.scss
+++ b/perf/modules/domain-picker-sk/domain-picker-sk.scss
@@ -17,12 +17,6 @@
height: 2em;
}
- dialog-sk {
- width: 25em;
- overflow-y: unset;
- z-index: 200;
- }
-
.ranges label span {
display: inline-block;
width: 10em;
