corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset cea60bbab4bc (bug 1926651) for causing multiple webgpu failures CLOSED TREE

Browse Source
This commit is contained in:
Cristian Tuns
2025-04-01 22:31:16 -04:00
parent ee787bc0fa
commit ec8127fe7b
4 changed files with 4 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/moz.configure/toolchain.configure
View File

@@ -926,16 +926,6 @@ def msvs_version(vc_compiler_version):
set_config("MSVS_VERSION", msvs_version)
with only_when(target_is_windows):
@depends(target)
def dxc_task_name(target):
return "dxc-" + target.cpu + "-pc-windows-msvc"
@depends_if(bootstrap_path(dxc_task_name))
def dxc_dll_path(bootstrap):
return os.path.join(bootstrap, "dxcompiler.dll")
clang_search_path = bootstrap_search_path("clang/bin")

23
taskcluster/kinds/build/windows.yml
View File

@@ -205,7 +205,6 @@ win64/debug:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -252,7 +251,6 @@ win64-non-unified/plain:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -302,7 +300,6 @@ win64-fuzzing/debug:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
optimization:
@@ -348,7 +345,6 @@ win64-plain/debug:
- vs
- nsis
- sysroot-wasm32-wasi
- dxc-x86_64-pc-windows-msvc
optimization:
skip-unless-expanded: null
@@ -398,7 +394,6 @@ win64/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -442,7 +437,6 @@ win64-plain/opt:
- vs
- nsis
- sysroot-wasm32-wasi
- dxc-x86_64-pc-windows-msvc
optimization:
skip-unless-expanded: null
@@ -559,7 +553,6 @@ win64-shippable/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -610,7 +603,6 @@ win64-nightlyasrelease/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -701,7 +693,6 @@ win64-add-on-devel/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -747,7 +738,6 @@ win64-noopt/debug:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -919,7 +909,6 @@ win64-rusttests/opt:
- win64-mozmake
- win64-dump_syms
- vs
- dxc-x86_64-pc-windows-msvc
optimization:
test-inclusive: [rusttests]
@@ -960,7 +949,6 @@ win64-rusttests/debug:
- win64-mozmake
- win64-dump_syms
- vs
- dxc-x86_64-pc-windows-msvc
optimization:
test-inclusive: [rusttests]
@@ -1013,7 +1001,6 @@ win64-ccov/opt:
- vs
- nsis
- sysroot-wasm32-wasi
- dxc-x86_64-pc-windows-msvc
win64-fuzzing-ccov/opt:
description: "Win64 Fuzzing Opt w/ Coverage"
@@ -1064,7 +1051,6 @@ win64-fuzzing-ccov/opt:
- vs
- nsis
- sysroot-wasm32-wasi
- dxc-x86_64-pc-windows-msvc
win64-asan/debug:
description: "Win64 Debug ASAN"
@@ -1110,7 +1096,6 @@ win64-asan/debug:
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
optimization:
@@ -1161,7 +1146,6 @@ win64-asan/opt:
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -1222,7 +1206,6 @@ win64-asan-reporter-shippable/opt:
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -1269,7 +1252,6 @@ win64-asan-fuzzing/opt:
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
optimization:
@@ -1389,7 +1371,6 @@ win64-devedition/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -1438,7 +1419,6 @@ win64-aarch64/debug:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-aarch64-pc-windows-msvc
fetch:
- upx-3.95-win
optimization:
@@ -1490,7 +1470,6 @@ win64-aarch64/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-aarch64-pc-windows-msvc
fetch:
- upx-3.95-win
optimization:
@@ -1546,7 +1525,6 @@ win64-aarch64-shippable/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-aarch64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -1601,6 +1579,5 @@ win64-aarch64-devedition/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- vs
- dxc-aarch64-pc-windows-msvc
fetch:
- upx-3.95-win

3
taskcluster/kinds/instrumented-build/kind.yml
View File

@@ -504,7 +504,6 @@ tasks:
- sysroot-wasm32-wasi
- vs
- windows-rs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -543,7 +542,6 @@ tasks:
- sysroot-wasm32-wasi
- vs
- windows-rs
- dxc-x86_64-pc-windows-msvc
fetch:
- upx-3.95-win
@@ -582,6 +580,5 @@ tasks:
- sysroot-wasm32-wasi
- vs
- windows-rs
- dxc-aarch64-pc-windows-msvc
fetch:
- upx-3.95-win

19
toolkit/moz.configure
View File

@@ -2701,29 +2701,16 @@ with only_when(compile_environment & target_is_windows):
set_config("MOZ_ANGLE_RENDERER", True)
with only_when(target_is_windows):
# We only produce dxc builds for x86_64 and aarch64.
@depends(target)
def dxc_supports_target(target):
return target.cpu in ("x86_64", "aarch64")
option(
"--enable-dxcompiler",
default=milestone.is_nightly,
help="{Enable|Disable} DXC for WebGPU on Windows",
when=dxc_supports_target,
)
@depends(
"--enable-dxcompiler",
target,
artifact_builds,
valid_windows_sdk_dir,
dxc_dll_path,
when=dxc_supports_target,
)
@depends("--enable-dxcompiler", target, artifact_builds, valid_windows_sdk_dir)
@checking("for dxcompiler.dll and dxil.dll")
@imports("os.path")
def dxcompiler(enable_dxc, target, artifact, windows_sdk_dir, dxc_path):
def dxcompiler(enable_dxc, target, artifact, windows_sdk_dir):
if not windows_sdk_dir and not artifact:
return namespace(enabled=False)
if not enable_dxc:
@@ -2735,9 +2722,11 @@ with only_when(target_is_windows):
dxc_name = "dxcompiler.dll"
dxil_name = "dxil.dll"
dxc_path = ""
dxil_path = ""
if not artifact:
sdk_d3d_path = os.path.join(windows_sdk_dir.path, "Redist", "D3D", arch)
dxc_path = os.path.join(sdk_d3d_path, dxc_name)
dxil_path = os.path.join(sdk_d3d_path, dxil_name)
if not os.path.exists(dxc_path):
die("Could not find dxcompiler.dll at {}", dxc_path)