Commit dc42dc0b authored by Joel Maher's avatar Joel Maher
Browse files

Bug 1490616 - Support xperf on windows 10. r=rwood 

run xperf on windows10 using new run-as-administrator feature

Differential Revision: https://phabricator.services.mozilla.com/D5658

--HG--
extra : moz-landing-system : lando
parent c39c649d

taskcluster/ci/test/talos.yml

+8 −0
Original line number Diff line number Diff line
@@ -603,14 +603,22 @@ talos-xperf: 
    treeherder-symbol: T(x)

    virtualization: virtual

    os-groups: ['Administrators']

    run-as-administrator:

        by-test-platform:

            windows7-32.*: false

            windows10-64.*: true

    run-on-projects:

        by-test-platform:

            windows7-32-msvc/.*: ['mozilla-beta', 'mozilla-central', 'try']

            windows7-32(-pgo)?/.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']

            windows10-64(-pgo)?/opt: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']

            .*-qr/.*: []  # this test is not useful with webrender

            default: []

    tier:

        by-test-platform:

            windows7-32.*: default

            windows10-64(-pgo)?/.*: default

            windows10-64-ccov/debug: 3

            default: 3  # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3

    mozharness:

        extra-options:

testing/talos/talos.json

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
            "pagesets_name": "tp5n.zip",

            "talos_options": [

                "--xperf_path",

                "\"c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe\""

                "\"c:/Program Files (x86)/Windows Kits/10/Windows Performance Toolkit/xperf.exe\""

            ]

        },

        "tp6-e10s": {

testing/talos/talos/config.py

+6 −2
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ def fix_xperf(config): 
    # BBB: remove doubly-quoted xperf values from command line

    # (needed for buildbot)

    # https://bugzilla.mozilla.org/show_bug.cgi?id=704654#c43

    win7_path = 'c:/Program Files/Microsoft Windows Performance Toolkit/xperf.exe'

    if config['xperf_path']:

        xperf_path = config['xperf_path']

        quotes = ('"', "'")
@@ -120,8 +121,11 @@ def fix_xperf(config): 
                config['xperf_path'] = xperf_path[1:-1]

                break

        if not os.path.exists(config['xperf_path']):

            # look for old win7 path

            if not os.path.exists(win7_path):

                raise ConfigurationError(

                    "xperf.exe cannot be found at the path specified")

            config['xperf_path'] = win7_path





@validator

testing/talos/talos/xtalos/xperf_whitelist.json

+24 −0
Original line number Diff line number Diff line
@@ -74,6 +74,30 @@ 
  "c:\\windows\\prefetch\\{prefetch}.pf": {

    "ignore": true

  },

  "c:\\windows\\system32\\windows.storage.dll": {

    "mincount": 2,

    "maxcount": 2,

    "minbytes": 0,

    "maxbytes": 24576

  },

  "c:\\windows\\system32\\ole32.dll": {

    "mincount": 4,

    "maxcount": 4,

    "minbytes": 0,

    "maxbytes": 65536

  },

  "c:\\windows\\system32\\ucrtbase.dll": {

    "mincount": 4,

    "maxcount": 4,

    "minbytes": 16384,

    "maxbytes": 32768

  },

  "c:\\windows\\system32\\user32.dll": {

    "mincount": 4,

    "maxcount": 4,

    "minbytes": 0,

    "maxbytes": 65536

  },

  "c:\\windows\\system32\\audioses.dll": {

    "mincount": 4,

    "maxcount": 4,