Skip to content

Commit c2261a9

Browse files
authored
Update WARP LKG to 1.0.15 (#397)
The newly released 1.0.15 fixes a bunch of issues we've encountered in our testing. This updates the LKG to the new version. I've tested this locally on arm64 and x86-64, and removed all the addressed XFAIL annotations. The WaveREadLaneAt.16 test gets a new XFAIL annotation. This was already failing on our arm64 bots because the issue occurs in WARP 1.0.14, since upgrading to 1.0.15 fixes more issues than it introduces I think this is the right tradeoff. This also should fix the only outstanding issue causing the arm64 WARP builder to fail, so this test enables the arm64 WARP builder on pre-merge tests. Note: The 1.0.15 release _is not_ based on the 1.0.15-preview release which caused some problems in our testing. So this should be safe to adopt. Fixes #358
1 parent 20e7b41 commit c2261a9

File tree

6 files changed

+5
-18
lines changed

6 files changed

+5
-18
lines changed

.github/workflows/pr-matrix.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
SKU: [windows-intel]
36+
SKU: [windows-intel, windows-qc]
3737
TestTarget: [check-hlsl-warp-d3d12, check-hlsl-clang-warp-d3d12]
3838

3939
uses: ./.github/workflows/build-and-test-callable.yaml

cmake/modules/Warp.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ function(setup_warp version)
2424
guess_nuget_arch(NUGET_ARCH)
2525

2626
if (version STREQUAL "LKG")
27-
if (NUGET_ARCH STREQUAL "arm64")
28-
set(version "1.0.14.2")
29-
else()
30-
set(version "1.0.10.1")
31-
endif()
27+
set(version "1.0.15")
3228
set(version_description "Latest Known Good for ${NUGET_ARCH} (${version})")
3329
else ()
3430
set(version_description "Custom (${version})")

test/Feature/HLSLLib/firstbithigh.64.test

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@ DescriptorSets:
8989
# https://github.com/microsoft/DirectXShaderCompiler/blob/48d6e3c635f0ab3ae79580c37003e6faeca6c671/tools/clang/test/CodeGenSPIRV/intrinsics.firstbitlow.64bit.hlsl#L5
9090
# UNSUPPORTED: DXC-Vulkan
9191

92-
# https://github.com/microsoft/DirectXShaderCompiler/issues/7502
93-
# WARP firstbithigh(s64 -1) should return -1 but returns 32 on older versions of
94-
# Warp. This was fixed for x86 in 1.0.14, but not for arm64.
95-
# XFAIL: DirectX-WARP
96-
9792
# https://github.com/llvm/llvm-project/issues/143171
9893
# XFAIL: Clang-Vulkan
9994

test/Feature/HLSLLib/mad.fp64.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ DescriptorSets:
8282
Binding: 3
8383
#--- end
8484

85-
# https://github.com/llvm/offload-test-suite/issues/358
86-
# XFAIL: DirectX-WARP
87-
8885
# REQUIRES: Double
8986
# RUN: split-file %s %t
9087
# RUN: %dxc_target -HV 202x -Gis -T cs_6_5 -Fo %t.o %t/source.hlsl

test/Feature/StructuredBuffer/inc_counter_array.test

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ DescriptorSets:
4949
# https://github.com/llvm/llvm-project/issues/154407
5050
# XFAIL: Clang-DirectX
5151

52-
# WARP has an issue counters in resource arrays
53-
# Internal issue #58567630
54-
# XFAIL: DirectX-WARP
55-
#
5652
# Intel has an issue with counters in resource arrays
5753
# https://github.com/llvm/offload-test-suite/issues/376
5854
# XFAIL: DirectX-Intel

test/WaveOps/WaveReadLaneAt.16.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ DescriptorSets:
138138
# Tracked by https://github.com/llvm/offload-test-suite/issues/351
139139
# XFAIL: Metal
140140

141+
# Bug tracked by https://github.com/llvm/offload-test-suite/issues/396
142+
# XFAIL: DirectX-WARP
143+
141144
# REQUIRES: Half, Int16
142145

143146
# RUN: split-file %s %t

0 commit comments

Comments
 (0)