Skip to content

Commit 14c6db1

Browse files
committed
change inf/nan/denorm values in float tests to regular values
1 parent 66c594f commit 14c6db1

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

test/Feature/HLSLLib/min.32.test

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ void main() {
1717
Out0[0] = min(X0[0], Y0[0]);
1818
Out0[1] = float4(min(X0[1].xyz, Y0[1].xyz), min(X0[1].w, Y0[1].w));
1919
Out0[2] = float4(min(X0[2].xy, Y0[2].xy), min(X0[2].zw, Y0[2].zw));
20-
Out0[3] = min(X0[3], Y0[3]);
21-
Out0[4] = min(half4(1.0, -1.0, 31408, -415), half4(-1.0, 1.0, 1.5, 129.5));
20+
Out0[3] = min(half4(1.0, -1.0, 31408, -415), half4(-1.0, 1.0, 1.5, 129.5));
2221

2322
// int
2423
Out1[0] = min(X1[0], Y1[0]);
2524
Out1[1] = int4(min(X1[1].xyz, Y1[1].xyz), min(X1[1].w, Y1[1].w));
2625
Out1[2] = int4(min(X1[2].xy, Y1[2].xy), min(X1[2].zw, Y1[2].zw));
2726
Out1[3] = min(X1[3], Y1[3]);
28-
Out1[3] = min(int4(-2147483648, -10, 10, 2147483647), int4(0, 10, 10, 0));;
27+
Out1[3] = min(int4(-2147483648, -10, 10, 2147483647), int4(0, 10, 10, 0));
2928

3029
// uint
3130
Out2[0] = min(X2[0], Y2[0]);
@@ -45,11 +44,11 @@ Buffers:
4544
- Name: X0
4645
Format: Float32
4746
Stride: 16
48-
Data: [ -inf, -inf, -inf, -inf, inf, inf, inf, inf, NaN, NaN, NaN, NaN, 1.0, 1.0, -1.0, -1.0 ]
47+
Data: [ 1.0, -1.0, 31408, -415, 3.14159, 42, -123.456, 0.0001, -10, 10.5, 3e+38, 0 ]
4948
- Name: Y0
5049
Format: Float32
5150
Stride: 16
52-
Data: [ -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN ]
51+
Data: [ -1.0, 1.0, 1.5, 129.5, 2.71828, 42, -654.321, 0.0002, 10, 10.5, 0, -3e+38 ]
5352
- Name: X1
5453
Format: Int32
5554
Stride: 16
@@ -69,11 +68,11 @@ Buffers:
6968
- Name: Out0
7069
Format: Float32
7170
Stride: 16
72-
ZeroInitSize: 80
71+
ZeroInitSize: 64
7372
- Name: ExpectedOut0
7473
Format: Float32
7574
Stride: 16
76-
Data: [ -inf, -inf, -inf, -inf, -inf, inf, 1.0, inf, -inf, inf, 1.0, NaN, -inf, 1.0, -1.0, -1.0, -1.0, -1.0, 1.5, -415 ]
75+
Data: [ -1.0, -1.0, 1.5, -415, 2.71828, 42, -654.321, 0.0001, -10, 10.5, 0, -3e+38, -1.0, -1.0, 1.5, -415 ]
7776
- Name: Out1
7877
Format: Int32
7978
Stride: 16

test/Feature/HLSLLib/min.fp16.test

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ void main() {
1010
Out[0] = min(X[0], Y[0]);
1111
Out[1] = half4(min(X[1].xyz, Y[1].xyz), min(X[1].w, Y[1].w));
1212
Out[2] = half4(min(X[2].xy, Y[2].xy), min(X[2].zw, Y[2].zw));
13-
Out[3] = min(X[3], Y[3]);
14-
Out[4] = min(half4(1.0, -1.0, 31408, -415), half4(-1.0, 1.0, 1.5, 129.5));
13+
Out[3] = min(half4(1.0, -1.0, 31408, -415), half4(-1.0, 1.0, 1.5, 129.5));
1514
}
1615
//--- pipeline.yaml
1716

@@ -24,22 +23,22 @@ Buffers:
2423
- Name: X
2524
Format: Float16
2625
Stride: 8
27-
Data: [ 0xfc00, 0xfc00, 0xfc00, 0xfc00, 0x7c00, 0x7c00, 0x7c00, 0x7c00, 0x7e00, 0x7e00, 0x7e00, 0x7e00, 0x3c00, 0x3c00, 0xbc00, 0xbc00 ]
28-
# -inf, -inf, -inf, -inf, inf, inf, inf, inf, NaN, NaN, NaN, NaN, 1.0, 1.0, -1.0, -1.0
26+
Data: [ 0x3c00, 0xbc00, 0x77ab, 0xde7c, 0x4248, 0x5140, 0xd7b7, 0x068e, 0xc900, 0x4940, 0x7bff, 0x0000 ]
27+
# 1.0, -1.0, 31408, -415, 3.14159, 42, -123.456, 0.0001, -10, 10.5, 65504, 0
2928
- Name: Y
3029
Format: Float16
3130
Stride: 8
32-
Data: [ 0xfc00, 0x7c00, 0x3c00, 0x7e00, 0xfc00, 0x7c00, 0x3c00, 0x7e00, 0xfc00, 0x7c00, 0x3c00, 0x7e00, 0xfc00, 0x7c00, 0x3c00, 0x7e00 ]
33-
# -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN
31+
Data: [ 0xbc00, 0x3c00, 0x3e00, 0x580c, 0x4170, 0x5140, 0xe11d, 0x0a8e, 0x4900, 0x4940, 0x0000, 0xfbff ]
32+
# -1.0, 1.0, 1.5, 129.5, 2.71828, 42, -654.321, 0.0002, 10, 10.5, 0, -65504
3433
- Name: Out
3534
Format: Float16
3635
Stride: 8
37-
ZeroInitSize: 40
36+
ZeroInitSize: 32
3837
- Name: ExpectedOut
3938
Format: Float16
4039
Stride: 8
41-
Data: [ 0xfc00, 0xfc00, 0xfc00, 0xfc00, 0xfc00, 0x7c00, 0x3c00, 0x7c00, 0xfc00, 0x7c00, 0x3c00, 0x7e00, 0xfc00, 0x3c00, 0xbc00, 0xbc00, 0xbc00, 0xbc00, 0x3e00, 0xde7c ]
42-
# -inf, -inf, -inf, -inf, -inf, inf, 1.0, inf, -inf, inf, 1.0, NaN, -inf, 1.0, -1.0, -1.0, -1.0, -1.0, 1.5, -415
40+
Data: [ 0xbc00, 0xbc00, 0x3e00, 0xde7c, 0x4170, 0x5140, 0xe11d, 0x068e, 0xc900, 0x4940, 0x0000, 0xfbff, 0xbc00, 0xbc00, 0x3e00, 0xde7c ]
41+
# -1.0, -1.0, 1.5, -415, 2.71828, 42, -654.321, 0.0001, -10, 10.5, 0, -65504, -1.0, -1.0, 1.5, -415
4342
Results:
4443
- Result: Test0
4544
Rule: BufferFloatEpsilon

test/Feature/HLSLLib/min.fp64.test

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ void main() {
1010
Out[0] = min(X[0], Y[0]);
1111
Out[1] = double4(min(X[1].xyz, Y[1].xyz), min(X[1].w, Y[1].w));
1212
Out[2] = double4(min(X[2].xy, Y[2].xy), min(X[2].zw, Y[2].zw));
13-
Out[3] = min(X[3], Y[3]);
14-
Out[4] = min(double4(1.0, -1.0, 31408, -415), double4(-1.0, 1.0, 1.5, 129.5));
13+
Out[3] = min(double4(1.0, -1.0, 31408, -415), double4(-1.0, 1.0, 1.5, 129.5));
1514
}
1615
//--- pipeline.yaml
1716

@@ -24,19 +23,19 @@ Buffers:
2423
- Name: X
2524
Format: Float64
2625
Stride: 32
27-
Data: [ -inf, -inf, -inf, -inf, inf, inf, inf, inf, NaN, NaN, NaN, NaN, 1.0, 1.0, -1.0, -1.0 ]
26+
Data: [ 1.0, -1.0, 31408, -415, 3.14159, 42, -123.456, 0.0001, -10, 10.5, 1e+308, 0 ]
2827
- Name: Y
2928
Format: Float64
3029
Stride: 32
31-
Data: [ -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN, -inf, inf, 1.0, NaN ]
30+
Data: [ -1.0, 1.0, 1.5, 129.5, 2.71828, 42, -654.321, 0.0002, 10, 10.5, 0, -1e+308 ]
3231
- Name: Out
3332
Format: Float64
3433
Stride: 32
35-
ZeroInitSize: 160
34+
ZeroInitSize: 128
3635
- Name: ExpectedOut0
3736
Format: Float64
3837
Stride: 32
39-
Data: [ -inf, -inf, -inf, -inf, -inf, inf, 1.0, inf, -inf, inf, 1.0, NaN, -inf, 1.0, -1.0, -1.0, -1.0, -1.0, 1.5, -415 ]
38+
Data: [ -1.0, -1.0, 1.5, -415, 2.71828, 42, -654.321, 0.0001, -10, 10.5, 0, -1e+308, -1.0, -1.0, 1.5, -415 ]
4039
Results:
4140
- Result: Test0
4241
Rule: BufferFloatEpsilon

0 commit comments

Comments
 (0)