0

Revert "Speculatively serialize trace_test on Win NVIDIA GTX 1660"

This reverts commit d37b39a8e8.

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}
This commit is contained in:
Yuly Novikov
2025-05-09 13:06:26 -07:00
committed by Chromium LUCI CQ
parent 43c403aee4
commit bd3e808d49
20 changed files with 19 additions and 36 deletions
infra/config
generated
builders
ci
GPU FYI Win Builder
GPU FYI Win x64 Builder (dbg)
GPU FYI Win x64 Builder
GPU Win x64 Builder (dbg)
GPU Win x64 Builder
Win10 FYI x64 Debug (NVIDIA)
Win10 FYI x64 Exp Release (NVIDIA)
Win10 FYI x64 Release (NVIDIA)
Win10 FYI x86 Release (NVIDIA)
Win10 x64 Debug (NVIDIA)
Win10 x64 Release (NVIDIA)
try
gpu-fyi-try-win10-nvidia-dbg-64
gpu-fyi-try-win10-nvidia-exp-64
gpu-fyi-try-win10-nvidia-rel-32
gpu-fyi-try-win10-nvidia-rel-64
gpu-try-win-nvidia-dbg
win-rel
lib
targets-internal
testing/buildbot

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -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"

@ -317,14 +317,6 @@ def _gpu_parallel_jobs(builder_name, settings, spec_value):
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,

@ -357,15 +357,6 @@ def GPUParallelJobs(test_config, tester_name, tester_config):
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']

@ -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"