Backed out changeset a1a54431e6d6 (bug 1620166) for causing beetmover exeptions Bug 1623616 a=backout
authorArthur Iakab <aiakab@mozilla.com>
Thu, 19 Mar 2020 16:33:03 +0200
changeset 519646 9f851fcfe33f9a13966a1bf59dc536ee2c8ccd33
parent 519535 f985871b3e622041babc71f3770275f045ae7f33
child 519647 e1342040e7eb59de587efc614980577d53e591da
push id110627
push usernerli@mozilla.com
push dateThu, 19 Mar 2020 17:16:35 +0000
treeherderautoland@91155f8ef56a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1620166, 1623616
milestone76.0a1
backs outa1a54431e6d61a5c12a69c3eb799ef59b088455e
first release with
nightly win32
9f851fcfe33f / 76.0a1 / 20200319143354 / files
nightly win64
9f851fcfe33f / 76.0a1 / 20200319143354 / files
nightly linux32
nightly linux64
nightly mac
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win32
nightly win64
Backed out changeset a1a54431e6d6 (bug 1620166) for causing beetmover exeptions Bug 1623616 a=backout
build/moz.configure/lto-pgo.configure
taskcluster/ci/build/windows.yml
taskcluster/ci/instrumented-build/kind.yml
--- a/build/moz.configure/lto-pgo.configure
+++ b/build/moz.configure/lto-pgo.configure
@@ -59,20 +59,20 @@ def pgo_profile_path(path, pgo_use, prof
         die('Argument to --with-pgo-profile-path must be a file.')
     if not os.path.isabs(path[0]):
         die('Argument to --with-pgo-profile-path must be an absolute path.')
     return path[0]
 
 
 set_config('PGO_PROFILE_PATH', pgo_profile_path)
 
-@depends(c_compiler, pgo_profile_path, target_is_windows)
+@depends(c_compiler, pgo_profile_path)
 @imports('multiprocessing')
 @imports(_from='__builtin__', _import='min')
-def pgo_flags(compiler, profdata, target_is_windows):
+def pgo_flags(compiler, profdata):
     if compiler.type == 'gcc':
         return namespace(
             gen_cflags=['-fprofile-generate'],
             gen_ldflags=['-fprofile-generate'],
             use_cflags=['-fprofile-use', '-fprofile-correction',
                         '-Wcoverage-mismatch'],
             use_ldflags=['-fprofile-use'],
         )
@@ -80,25 +80,18 @@ def pgo_flags(compiler, profdata, target
     if compiler.type in ('clang-cl', 'clang'):
         prefix = ''
         if compiler.type == 'clang-cl':
             prefix = '/clang:'
             gen_ldflags = None
         else:
             gen_ldflags = ['-fprofile-generate']
 
-        gen_cflags = [prefix + '-fprofile-generate']
-        if target_is_windows:
-            # native llvm-profdata.exe on Windows can't read profile data
-            # if name compression is enabled (which cross-compiling enables
-            # by default)
-            gen_cflags += ['-mllvm', '-enable-name-compression=false']
-
         return namespace(
-            gen_cflags=gen_cflags,
+            gen_cflags=[prefix + '-fprofile-generate'],
             gen_ldflags=gen_ldflags,
             use_cflags=[prefix + '-fprofile-use=%s' % profdata,
                         # Some error messages about mismatched profile data
                         # come in via -Wbackend-plugin, so disable those too.
                         '-Wno-error=backend-plugin'],
             use_ldflags=[],
         )
 
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -354,53 +354,41 @@ win32-shippable/opt:
                     try: true
                     default: false
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-32-shippable/opt
         symbol: Bpgo(B)
         tier: 1
-    worker-type: b-linux
+    worker-type: b-win2012
     worker:
-        docker-image: {in-tree: debian9-amd64-build}
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
-        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-              builds/releng_base_linux_64_builds.py
+            - builds/taskcluster_base_windows.py
+            - builds/taskcluster_base_win32.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win32
-            mozconfig_platform: win32
-            env:
-                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     fetches:
         toolchain:
-            - linux64-binutils
-            - linux64-clang-win-cross
-            - linux64-rust-cross
-            - linux64-rust-size
-            - linux64-nasm
-            - linux64-node
-            - linux64-cbindgen
-            - linux64-dump-syms
-            - linux64-wine
-            - linux64-liblowercase
-        fetch:
-            - nsis-3.01-win
-            - upx-3.95-win
+            - win64-clang-cl
+            - win64-rust
+            - win64-rust-size
+            - win64-cbindgen
+            - win64-nasm
+            - win64-node
 
 win64-shippable/opt:
     description: "Win64 Shippable"
     use-pgo: true
     index:
         product: firefox
         job-name: win64-opt
         type: shippable
@@ -408,53 +396,41 @@ win64-shippable/opt:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-64-shippable/opt
         symbol: Bpgo(B)
         tier: 1
-    worker-type: b-linux
+    worker-type: b-win2012
     worker:
-        docker-image: {in-tree: debian9-amd64-build}
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
-        actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/releng_base_linux_64_builds.py
+            - builds/taskcluster_base_windows.py
+            - builds/taskcluster_base_win64.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64
-            mozconfig_platform: win64
-            env:
-                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
     fetches:
         toolchain:
-            - linux64-binutils
-            - linux64-clang-win-cross
-            - linux64-rust-cross
-            - linux64-rust-size
-            - linux64-nasm
-            - linux64-node
-            - linux64-cbindgen
-            - linux64-dump-syms
-            - linux64-wine
-            - linux64-liblowercase
-        fetch:
-            - nsis-3.01-win
-            - upx-3.95-win
+            - win64-clang-cl
+            - win64-rust
+            - win64-rust-size
+            - win64-cbindgen
+            - win64-nasm
+            - win64-node
 
 win32-add-on-devel/opt:
     description: "Windows32 add-on-devel"
     index:
         product: firefox
         job-name: win32-add-on-devel
     treeherder:
         platform: windows2012-32-add-on-devel/opt
@@ -1305,55 +1281,45 @@ win64-aarch64-shippable-no-eme/opt:
         # though no tests run against this task directly.
         skip-verify-test-packaging: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-aarch64/opt
         symbol: Nn
         tier: 1
-    worker-type: b-linux
+    worker-type: b-win2012
     worker:
-        docker-image: {in-tree: debian9-amd64-build}
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme
             MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         secrets: true
         config:
             - builds/releng_base_firefox.py
-            - builds/releng_base_linux_64_builds.py
+            - builds/taskcluster_base_windows.py
             - taskcluster_nightly.py
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
-            env:
-                LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
     run-on-projects: []
     fetches:
         toolchain:
-            - linux64-binutils
-            - linux64-clang-win-cross
-            - linux64-rust-cross
-            - linux64-rust-size
-            - linux64-nasm
-            - linux64-node
-            - linux64-cbindgen
-            - linux64-dump-syms
-            - linux64-wine
-            - linux64-liblowercase
-        fetch:
-            - nsis-3.01-win
-            - upx-3.95-win
+            - win64-clang-cl
+            - win64-rust
+            - win64-rust-size
+            - win64-cbindgen
+            - win64-nasm
+            - win64-node
+
 
 win64-aarch64-devedition/opt:
     description: "AArch64 Win64 MSVC Devedition (shippable)"
     index:
         product: devedition
         job-name: win64-aarch64-opt
         type: nightly
     attributes:
--- a/taskcluster/ci/instrumented-build/kind.yml
+++ b/taskcluster/ci/instrumented-build/kind.yml
@@ -167,83 +167,63 @@ jobs:
     win32-shippable/opt:
         description: "Win32 Shippable PGO Instrumented"
         index:
             product: firefox
             job-name: instrumented-win32
         shipping-product: firefox
         treeherder:
             platform: windows2012-32-shippable/opt
-        worker-type: b-linux
+        worker-type: b-win2012
         worker:
-            docker-image: {in-tree: debian9-amd64-build}
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
         run:
             options: [append-env-variables-from-configs]
             mozconfig-variant: profile-generate
             config:
                 - builds/releng_base_firefox.py
-                - builds/releng_base_linux_64_builds.py
+                - builds/taskcluster_base_windows.py
+                - builds/taskcluster_base_win32.py
             tooltool-downloads: internal
             extra-config:
                 stage_platform: win32
-                mozconfig_platform: win32
-                env:
-                    LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                    LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         fetches:
             toolchain:
-                - linux64-binutils
-                - linux64-clang-win-cross
-                - linux64-rust-cross
-                - linux64-rust-size
-                - linux64-nasm
-                - linux64-node
-                - linux64-cbindgen
-                - linux64-dump-syms
-                - linux64-wine
-                - linux64-liblowercase
-            fetch:
-                - nsis-3.01-win
-                - upx-3.95-win
+                - win64-clang-cl
+                - win64-dump-syms
+                - win64-rust
+                - win64-rust-size
+                - win64-cbindgen
+                - win64-nasm
+                - win64-node
 
     win64-shippable/opt:
         description: "Win64 Shippable PGO Instrumented"
         index:
             product: firefox
             job-name: instrumented-win64
         shipping-product: firefox
         treeherder:
             platform: windows2012-64-shippable/opt
-        worker-type: b-linux
+        worker-type: b-win2012
         worker:
-            docker-image: {in-tree: debian9-amd64-build}
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
         run:
             options: [append-env-variables-from-configs]
             mozconfig-variant: profile-generate
             config:
                 - builds/releng_base_firefox.py
-                - builds/releng_base_linux_64_builds.py
+                - builds/taskcluster_base_windows.py
+                - builds/taskcluster_base_win64.py
             tooltool-downloads: internal
             extra-config:
                 stage_platform: win64
-                mozconfig_platform: win64
-                env:
-                    LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                    LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4"
         fetches:
             toolchain:
-                - linux64-binutils
-                - linux64-clang-win-cross
-                - linux64-rust-cross
-                - linux64-rust-size
-                - linux64-nasm
-                - linux64-node
-                - linux64-cbindgen
-                - linux64-dump-syms
-                - linux64-wine
-                - linux64-liblowercase
-            fetch:
-                - nsis-3.01-win
-                - upx-3.95-win
+                - win64-clang-cl
+                - win64-dump-syms
+                - win64-rust
+                - win64-rust-size
+                - win64-cbindgen
+                - win64-nasm
+                - win64-node