Skip to content

Fxp 3678 update browsers on awfy #532

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

Open
kala-moz wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Fxp 3678 update browsers on awfy #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e6acda
update browsers
kala-moz Dec 4, 2024
a08f2f5
skipped failing test
kala-moz Dec 4, 2024
f33eb33
removed skipped test
kala-moz Dec 4, 2024
c9e4a25
Revert yarn.lock to previous version and add cyan colors
kala-moz Dec 5, 2024
97e97ea
revert test changes in perfherder.test.js
kala-moz Dec 6, 2024
eada3d9
changed perfherder.test.js
kala-moz Dec 6, 2024
90acbf7
remove -u flag from config.yml
kala-moz Dec 12, 2024
75963d7
lint fix
kala-moz Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 48 additions & 62 deletions src/awfy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { PROJECT, ALT_PROJECT } from './utils/perfherder';
import { queryInfoGen } from './config-utils';
import { BENCHMARKS as AWSY_BENCHMARKS, DEFAULT_CATEGORIES as AWSY_CATEGORIES } from './awsy';
import {
BENCHMARKS as AWSY_BENCHMARKS,
DEFAULT_CATEGORIES as AWSY_CATEGORIES,
} from './awsy';
import { BENCHMARKS as H3_BENCHMARKS, DEFAULT_SUITES as H3_SUITES } from './h3';

const TALOS_FRAMEWORK_ID = 1;
Expand All @@ -16,33 +19,25 @@ const PALETTE = {
yellow: '#ebc23f',
violet: '#a66e97',
pink: '#fe939e',
cyan: '#00FFFF',
};

export const AWFY_BENCHMARKS = {
'speedometer-android': {
compare: {
'chrome-m': {
color: PALETTE.blue,
'cstm-car-m': {
color: PALETTE.cyan,
label: 'Chrome',
frameworkId: BROWSERTIME_FRAMEWORK_ID,
suite: 'speedometer',
option: 'opt',
application: 'chrome-m',
application: 'cstm-car-m',
project: PROJECT,
},
geckoview: {
color: PALETTE.indigo,
label: 'GeckoView',
frameworkId: BROWSERTIME_FRAMEWORK_ID,
suite: 'speedometer',
option: 'opt',
application: 'geckoview',
project: ALT_PROJECT,
extraOptions: ['webrender'],
},

fenix: {
color: PALETTE.orange,
label: 'Fenix',
label: 'Firefox',
frameworkId: BROWSERTIME_FRAMEWORK_ID,
suite: 'speedometer',
option: 'opt',
Expand All @@ -55,28 +50,19 @@ export const AWFY_BENCHMARKS = {
},
'speedometer3-android': {
compare: {
'chrome-m': {
color: PALETTE.blue,
'cstm-car-m': {
color: PALETTE.cyan,
label: 'Chrome',
frameworkId: BROWSERTIME_FRAMEWORK_ID,
suite: 'speedometer3',
option: 'opt',
application: 'chrome-m',
application: 'cstm-car-m',
project: PROJECT,
},
geckoview: {
color: PALETTE.indigo,
label: 'GeckoView',
frameworkId: BROWSERTIME_FRAMEWORK_ID,
suite: 'speedometer3',
option: 'opt',
application: 'geckoview',
project: ALT_PROJECT,
extraOptions: ['webrender'],
},

fenix: {
color: PALETTE.orange,
label: 'Fenix',
label: 'Firefox',
frameworkId: BROWSERTIME_FRAMEWORK_ID,
suite: 'speedometer3',
option: 'opt',
Expand All @@ -102,14 +88,9 @@ const DESKTOP_FIREFOX_APPS = {
const DESKTOP_APPS = {
...DESKTOP_FIREFOX_APPS,
chrome: {
name: 'chrome',
name: 'custom-car',
label: 'Chrome',
color: PALETTE.blue,
},
safari: {
name: 'safari',
label: 'Safari',
color: PALETTE.yellow,
color: PALETTE.cyan,
},
safari_tp: {
name: 'safari-tp',
Expand Down Expand Up @@ -193,8 +174,15 @@ const TALOS_TESTS = {

const TALOS_BENCHMARKS = {};
Object.entries(TALOS_TESTS).forEach(([testKey, test]) => {
const docUrl = `https://firefox-source-docs.mozilla.org/testing/perfdocs/talos.html#${testKey.replace(/_/g, '-')}`;
TALOS_BENCHMARKS[testKey] = { compare: {}, label: test.label || testKey, docUrl };
const docUrl = `https://firefox-source-docs.mozilla.org/testing/perfdocs/talos.html#${testKey.replace(
/_/g,
'-',
)}`;
TALOS_BENCHMARKS[testKey] = {
compare: {},
label: test.label || testKey,
docUrl,
};
Object.entries(DESKTOP_FIREFOX_APPS).forEach(([appKey, app]) => {
TALOS_BENCHMARKS[testKey].compare[appKey] = {
color: app.color,
Expand All @@ -208,7 +196,9 @@ Object.entries(TALOS_TESTS).forEach(([testKey, test]) => {
extraOptions: ['e10s', 'stylo'],
};
if (Array.isArray(app.extraOptions)) {
TALOS_BENCHMARKS[testKey].compare[appKey].extraOptions.push(...app.extraOptions);
TALOS_BENCHMARKS[testKey].compare[appKey].extraOptions.push(
...app.extraOptions,
);
}
DESKTOP_CATEGORIES.benchmarks.suites.push(testKey);
});
Expand Down Expand Up @@ -395,7 +385,9 @@ Object.entries(SITES).forEach(([siteKey, siteLabel]) => {
BENCHMARKS[bmKey].compare[appKey].extraOptions.push('live');
}
if (Array.isArray(app.extraOptions)) {
BENCHMARKS[bmKey].compare[appKey].extraOptions.push(...app.extraOptions);
BENCHMARKS[bmKey].compare[appKey].extraOptions.push(
...app.extraOptions,
);
}
});
DESKTOP_CATEGORIES[category].suites.push(bmKey);
Expand All @@ -404,10 +396,10 @@ Object.entries(SITES).forEach(([siteKey, siteLabel]) => {
});

const MOBILE_APPS = {
'chrome-m': {
name: 'chrome-m',
'cstm-car-m': {
name: 'cstm-car-m',
label: 'Chrome',
color: PALETTE.blue,
color: PALETTE.cyan,
},
fenix: {
name: 'fenix',
Expand All @@ -423,20 +415,6 @@ const MOBILE_APPS = {
project: PROJECT,
extraOptions: ['webrender', 'fission'],
},
geckoview: {
name: 'geckoview',
label: 'GeckoView-nofis',
color: PALETTE.indigo,
project: ALT_PROJECT,
extraOptions: ['webrender'],
},
'geckoview-fission': {
name: 'geckoview',
label: 'GeckoView-fission',
color: PALETTE.red,
project: PROJECT,
extraOptions: ['webrender', 'fission'],
},
};

const MOBILE_CATEGORIES = {
Expand Down Expand Up @@ -491,7 +469,9 @@ Object.entries(SITES).forEach(([siteKey, siteLabel]) => {
BENCHMARKS[bmKey].compare[appKey].project = PROJECT;
}
if (Array.isArray(app.extraOptions)) {
BENCHMARKS[bmKey].compare[appKey].extraOptions.push(...app.extraOptions);
BENCHMARKS[bmKey].compare[appKey].extraOptions.push(
...app.extraOptions,
);
}
});
MOBILE_CATEGORIES[category].suites.push(bmKey);
Expand Down Expand Up @@ -533,7 +513,10 @@ export const CONFIG = {
},
win10: {
label: 'Windows 10 64bit',
platforms: ['windows10-64-shippable-qr', 'windows10-64-2004-shippable-qr'],
platforms: [
'windows10-64-shippable-qr',
'windows10-64-2004-shippable-qr',
],
categories: DESKTOP_CATEGORIES,
},
win11: {
Expand All @@ -554,9 +537,12 @@ export const TIMERANGE_UPPER_LIMIT = 365;

// Given a view configuration return a data structure with the data
// structure needed to query Treeherder
export const queryInfo = (viewConfig, benchmark, category) => queryInfoGen(BENCHMARKS, viewConfig,
benchmark, category);
// eslint-disable-next-line max-len
export const queryInfo = (viewConfig, benchmark, category) => queryInfoGen(BENCHMARKS, viewConfig, benchmark, category);

export default {
queryInfo, BENCHMARKS, CONFIG, TIMERANGE_UPPER_LIMIT,
queryInfo,
BENCHMARKS,
CONFIG,
TIMERANGE_UPPER_LIMIT,
};
2 changes: 1 addition & 1 deletion src/components/App/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class App extends Component {
{Object.values(benchmarks).length ? Object.values(benchmarks).sort(sortByLabel).map(({
benchmarkUID, compare, label, docUrl, includeSubtests, yLabel,
}) => (
<div key={label}>
<div key={benchmarkUID}>
<PerfherderGraph
extraLink={`/${viewPlatform}/${category}/${benchmarkUID}?numDays=${dayRange}`}
title={label}
Expand Down
1 change: 0 additions & 1 deletion src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ import React from 'react';
import ReactDOM from 'react-dom';
import Router from './components/Router';


ReactDOM.render(<Router />, document.getElementById('root'));
35 changes: 20 additions & 15 deletions test/components/__snapshots__/Pickers.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`renders correctly 1`] = `
>
<div
aria-haspopup="listbox"
aria-labelledby=" mui-component-select-platform"
aria-labelledby="mui-component-select-platform"
class="MuiSelect-root MuiSelect-select MuiSelect-selectMenu MuiInputBase-input MuiInput-input"
id="mui-component-select-platform"
role="button"
Expand All @@ -32,15 +32,16 @@ exports[`renders correctly 1`] = `
Windows 10 64bit
</div>
<input
aria-hidden="true"
class="MuiSelect-nativeInput"
name="platform"
type="hidden"
tabindex="-1"
value="win10"
/>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSelect-icon"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
Expand Down Expand Up @@ -68,7 +69,7 @@ exports[`renders correctly 1`] = `
>
<div
aria-haspopup="listbox"
aria-labelledby=" mui-component-select-category"
aria-labelledby="mui-component-select-category"
class="MuiSelect-root MuiSelect-select MuiSelect-selectMenu MuiInputBase-input MuiInput-input"
id="mui-component-select-category"
role="button"
Expand All @@ -77,15 +78,16 @@ exports[`renders correctly 1`] = `
Benchmarks
</div>
<input
aria-hidden="true"
class="MuiSelect-nativeInput"
name="category"
type="hidden"
tabindex="-1"
value="benchmarks"
/>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSelect-icon"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
Expand Down Expand Up @@ -113,7 +115,7 @@ exports[`renders correctly 1`] = `
>
<div
aria-haspopup="listbox"
aria-labelledby=" mui-component-select-results"
aria-labelledby="mui-component-select-results"
class="MuiSelect-root MuiSelect-select MuiSelect-selectMenu MuiInputBase-input MuiInput-input"
id="mui-component-select-results"
role="button"
Expand All @@ -122,15 +124,16 @@ exports[`renders correctly 1`] = `
Overview
</div>
<input
aria-hidden="true"
class="MuiSelect-nativeInput"
name="results"
type="hidden"
tabindex="-1"
value="overview"
/>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSelect-icon"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
Expand Down Expand Up @@ -158,7 +161,7 @@ exports[`renders correctly 1`] = `
>
<div
aria-haspopup="listbox"
aria-labelledby=" mui-component-select-numDays"
aria-labelledby="mui-component-select-numDays"
class="MuiSelect-root MuiSelect-select MuiSelect-selectMenu MuiInputBase-input MuiInput-input"
id="mui-component-select-numDays"
role="button"
Expand All @@ -167,15 +170,16 @@ exports[`renders correctly 1`] = `
Last 60 days
</div>
<input
aria-hidden="true"
class="MuiSelect-nativeInput"
name="numDays"
type="hidden"
tabindex="-1"
value="60"
/>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSelect-icon"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
Expand All @@ -187,7 +191,7 @@ exports[`renders correctly 1`] = `
</form>
<div>
<div
class="MuiFormControl-root MultipleSelectPicker-formControl-85"
class="MuiFormControl-root MultipleSelectPicker-formControl-3"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiFormLabel-filled"
Expand All @@ -210,15 +214,16 @@ exports[`renders correctly 1`] = `
Firefox
</div>
<input
aria-hidden="true"
class="MuiSelect-nativeInput"
name="series"
type="hidden"
tabindex="-1"
value="Firefox"
/>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSelect-icon"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<path
Expand Down
Loading