Skip to content

Commit 56db5c4

Browse files
committed
xfail clang-metal, edit some tests
1 parent a6ec6e7 commit 56db5c4

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

test/Feature/HLSLLib/mad.32.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ DescriptorSets:
209209

210210
# TODO: https://github.com/llvm/llvm-project/issues/152220
211211
# XFAIL: Clang-DirectX
212+
# XFAIL: Clang-Metal
212213

213214
# RUN: split-file %s %t
214215
# RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl

test/Feature/HLSLLib/mad.fp64.test

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ void main() {
1111
Out[0] = mad(M[0], A[0], B[0]);
1212
Out[1] = double4(mad(M[1].xyz, A[1].xyz, B[1].xyz), mad(M[1].w, A[1].w, B[1].w));
1313
Out[2] = double4(mad(M[2].xy, A[2].xy, B[2].xy), mad(M[2].zw, A[2].zw, B[2].zw));
14-
Out[3] = mad(double4(1.0, 1.5, 1e+308, -1e+308), double4(1.0, 10, 2, 2), double4(1.0, -5.5, 0, 0));
14+
Out[3] = mad(double4(1.0, 1.5, 1e+308l, -1e+308l), double4(1.0, 10, 2, 2), double4(1.0, -5.5, 0, 0));
1515
}
1616
//--- pipeline.yaml
1717

@@ -34,16 +34,16 @@ Buffers:
3434
- Name: B
3535
Format: Float64
3636
Stride: 32
37-
Data: [ NaN, -Inf, 0x0.fffffffffffffp-1022, -0, 0, Inf, 1.0, -1.0, 1, 0, -5.5, 1 ]
38-
# NaN, -Inf, denorm, -0, 0, Inf, 1.0, -1.0, 1, 0, -5.5, 1
37+
Data: [ NaN, -Inf, 0, -0, 0, Inf, 1.0, -1.0, 1, 0, -5.5, 1 ]
38+
# NaN, -Inf, 0, -0, 0, Inf, 1.0, -1.0, 1, 0, -5.5, 1
3939
- Name: Out
4040
Format: Float64
4141
Stride: 32
4242
ZeroInitSize: 128
4343
- Name: ExpectedOut
4444
Format: Float64
4545
Stride: 32
46-
Data: [ NaN, NaN, 0x1.ffffffffffffep-1022, 0, 0, Inf, 2, 0, 1, 1, 9.5, -16.5, 2, 9.5, Inf, -Inf ]
46+
Data: [ NaN, NaN, 0x0.fffffffffffffp-1022, 0, 0, Inf, 2, 0, 1, 1, 9.5, -16.5, 2, 9.5, Inf, -Inf ]
4747
Results:
4848
- Result: Test0
4949
Rule: BufferFloatULP
@@ -84,5 +84,5 @@ DescriptorSets:
8484

8585
# REQUIRES: Double
8686
# RUN: split-file %s %t
87-
# RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
87+
# RUN: %dxc_target -HV 202x -T cs_6_5 -Fo %t.o %t/source.hlsl
8888
# RUN: %offloader %t/pipeline.yaml %t.o

test/Feature/HLSLLib/mad.int16.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ DescriptorSets:
143143

144144
# TODO: https://github.com/llvm/llvm-project/issues/152220
145145
# XFAIL: Clang-DirectX
146+
# XFAIL: Clang-Metal
146147

147148
# REQUIRES: Int16
148149
# RUN: split-file %s %t

test/Feature/HLSLLib/mad.int64.test

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ void main() {
1616
Out0[0] = mad(M0[0], A0[0], B0[0]);
1717
Out0[1] = int64_t4(mad(M0[1].xyz, A0[1].xyz, B0[1].xyz), mad(M0[1].w, A0[1].w, B0[1].w));
1818
Out0[2] = int64_t4(mad(M0[2].xy, A0[2].xy, B0[2].xy), mad(M0[2].zw, A0[2].zw, B0[2].zw));
19-
Out0[3] = mad(int64_t4(-9223372036854775808, -256, 9223372036854775807, -9223372036854775808), int4(1, -512, 1, 1), int4(0, 0, 1, -1));
19+
Out0[3] = mad(int64_t4(-9223372036854775807, -256, 9223372036854775807, -4611686018427387904), int64_t4(1, -512, 1, 2), int64_t4(0, 0, 1, -1));
2020

2121
// uint64_t
2222
Out1[0] = mad(M1[0], A1[0], B1[0]);
2323
Out1[1] = uint64_t4(mad(M1[1].xyz, A1[1].xyz, B1[1].xyz), mad(M1[1].w, A1[1].w, B1[1].w));
2424
Out1[2] = uint64_t4(mad(M1[2].xy, A1[2].xy, B1[2].xy), mad(M1[2].zw, A1[2].zw, B1[2].zw));
25-
Out1[3] = mad(uint64_t4(2, 16, 4294967296, 18446744073709551615), uint64_t4(2, 16, 4294967296, 1), uint64_t4(1, 15, 1, 1));
25+
Out1[3] = mad(uint64_t4(2, 16, 4294967296, 6148914691236517205), uint64_t4(2, 16, 4294967296, 3), uint64_t4(1, 15, 1, 1));
2626
}
2727
//--- pipeline.yaml
2828

@@ -35,7 +35,7 @@ Buffers:
3535
- Name: M0
3636
Format: Int64
3737
Stride: 8
38-
Data: [ -9223372036854775808, -256, -1, 0, 1, 2, 16, 9223372036854775807, 1, -1, 1, 10 ]
38+
Data: [ -9223372036854775807, -256, -1, 0, 1, 2, 16, 9223372036854775807, 1, -1, 1, 10 ]
3939
- Name: A0
4040
Format: Int64
4141
Stride: 8
@@ -63,7 +63,7 @@ Buffers:
6363
- Name: ExpectedOut0
6464
Format: Int64
6565
Stride: 32
66-
Data: [ -9223372036854775808, 131072, 1, 0, 2, 9, 257, 255, 9223372036854775807, -9223372036854775807, 0, -1000, -9223372036854775808, 131072, -9223372036854775808, 9223372036854775807 ]
66+
Data: [ -9223372036854775807, 131072, 1, 0, 2, 9, 257, 255, 9223372036854775807, -9223372036854775807, 0, -1000, -9223372036854775807, 131072, -9223372036854775808, 9223372036854775807 ]
6767
- Name: Out1
6868
Format: UInt64
6969
Stride: 32
@@ -143,6 +143,7 @@ DescriptorSets:
143143

144144
# TODO: https://github.com/llvm/llvm-project/issues/152220
145145
# XFAIL: Clang-DirectX
146+
# XFAIL: Clang-Metal
146147

147148
# REQUIRES: Int64
148149
# RUN: split-file %s %t

0 commit comments

Comments
 (0)