Revert "Speculatively serialize trace_test on Win NVIDIA GTX 1660"
This reverts commit d37b39a8e8f10b4eb2c0a4bc20ca4848c150b913.
Reason for revert: hangs still happen
Bug: 406454932
Original change's description:
> Speculatively serialize trace_test on Win NVIDIA GTX 1660
>
> Parallelization suspect for flaky machine hangs on this platform.
>
> Bug: 406454932
> Change-Id: I36582f2fed1ec958fff179d0b39b50c63831387f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6397476
> Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
> Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
> Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1438367}
Bug: 406454932
Change-Id: Iac3c66aa399305de2eedd6a16614957b43130b94
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6532906
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1458298}
diff --git a/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json
index e1721f2..c187760 100644
--- a/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json
+++ b/infra/config/generated/builders/ci/GPU FYI Win Builder/targets/chromium.gpu.fyi.json
@@ -651,7 +651,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json"
index 1133709..51144ae5 100644
--- "a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json"
+++ "b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder \050dbg\051/targets/chromium.gpu.fyi.json"
@@ -432,7 +432,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json
index 204fcf0..ce4557d1 100644
--- a/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json
+++ b/infra/config/generated/builders/ci/GPU FYI Win x64 Builder/targets/chromium.gpu.fyi.json
@@ -696,7 +696,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
@@ -3646,7 +3646,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json"
index 14e8987..489d25d 100644
--- "a/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json"
+++ "b/infra/config/generated/builders/ci/GPU Win x64 Builder \050dbg\051/targets/chromium.gpu.json"
@@ -425,7 +425,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json b/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json
index 290c5d5..5433f51a 100644
--- a/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json
+++ b/infra/config/generated/builders/ci/GPU Win x64 Builder/targets/chromium.gpu.json
@@ -425,7 +425,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json"
index 49b8c9d..60e75b45 100644
--- "a/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json"
+++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Debug \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -431,7 +431,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
index d812ebe..8fd94006 100644
--- "a/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
+++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Exp Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -695,7 +695,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
index 754b6cd6..29a9276 100644
--- "a/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
+++ "b/infra/config/generated/builders/ci/Win10 FYI x64 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -650,7 +650,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json" "b/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
index 89ae2476..d2fef63 100644
--- "a/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
+++ "b/infra/config/generated/builders/ci/Win10 FYI x86 Release \050NVIDIA\051/targets/chromium.gpu.fyi.json"
@@ -650,7 +650,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json"
index 14e8987..489d25d 100644
--- "a/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json"
+++ "b/infra/config/generated/builders/ci/Win10 x64 Debug \050NVIDIA\051/targets/chromium.gpu.json"
@@ -425,7 +425,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git "a/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json" "b/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json"
index 290c5d5..5433f51a 100644
--- "a/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json"
+++ "b/infra/config/generated/builders/ci/Win10 x64 Release \050NVIDIA\051/targets/chromium.gpu.json"
@@ -425,7 +425,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json
index 1133709..51144ae5 100644
--- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json
+++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-dbg-64/targets/chromium.gpu.fyi.json
@@ -432,7 +432,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json
index 2778b654..babe764 100644
--- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json
+++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-exp-64/targets/chromium.gpu.fyi.json
@@ -696,7 +696,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json
index e1721f2..c187760 100644
--- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json
+++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-32/targets/chromium.gpu.fyi.json
@@ -651,7 +651,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json
index e33bda9..59a494b 100644
--- a/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json
+++ b/infra/config/generated/builders/try/gpu-fyi-try-win10-nvidia-rel-64/targets/chromium.gpu.fyi.json
@@ -651,7 +651,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json b/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json
index 14e8987..489d25d 100644
--- a/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json
+++ b/infra/config/generated/builders/try/gpu-try-win-nvidia-dbg/targets/chromium.gpu.json
@@ -425,7 +425,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json b/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json
index 290c5d5..5433f51a 100644
--- a/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json
+++ b/infra/config/generated/builders/try/win-rel/targets/chromium.gpu.json
@@ -425,7 +425,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
diff --git a/infra/config/lib/targets-internal/magic_args.star b/infra/config/lib/targets-internal/magic_args.star
index ed99878..3980529 100644
--- a/infra/config/lib/targets-internal/magic_args.star
+++ b/infra/config/lib/targets-internal/magic_args.star
@@ -317,14 +317,6 @@
if gpu.startswith("10de"):
return ["--jobs=1"]
- # trace_test flakily hangs Win NVIDIA GTX 1660 machines crbug.com/406454932.
- # Speculatively disable parallelism to check if it is related.
- is_trace_test = test_name == "trace_test" or suite == "trace_test"
- if settings.os_type == common.os_type.WINDOWS and is_trace_test:
- for gpu in _get_gpus(spec_value):
- if gpu.startswith("10de:2184"):
- return ["--jobs=1"]
-
if settings.os_type in (
common.os_type.LACROS,
common.os_type.LINUX,
diff --git a/testing/buildbot/buildbot_json_magic_substitutions.py b/testing/buildbot/buildbot_json_magic_substitutions.py
index 702f257..37f93be 100644
--- a/testing/buildbot/buildbot_json_magic_substitutions.py
+++ b/testing/buildbot/buildbot_json_magic_substitutions.py
@@ -357,15 +357,6 @@
if gpu.startswith('10de'):
return ['--jobs=1']
- # trace_test flakily hangs Win NVIDIA GTX 1660 machines crbug.com/406454932.
- # Speculatively disable parallelism to check if it is related.
- is_trace_test = (test_name == 'trace_test'
- or test_config.get('telemetry_test_name') == 'trace_test')
- if os_type == 'win' and is_trace_test:
- for gpu in _GetGpusFromTestConfig(test_config):
- if gpu.startswith('10de:2184'):
- return ['--jobs=1']
-
if os_type in ['lacros', 'linux', 'mac', 'win']:
return ['--jobs=4']
return ['--jobs=1']
diff --git a/testing/buildbot/client.v8.fyi.json b/testing/buildbot/client.v8.fyi.json
index 015fb02..8b8a989 100644
--- a/testing/buildbot/client.v8.fyi.json
+++ b/testing/buildbot/client.v8.fyi.json
@@ -2929,7 +2929,7 @@
"--stable-jobs",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--enforce-browser-version",
- "--jobs=1"
+ "--jobs=4"
],
"merge": {
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
