[Piglit] [PATCH 3/4] cl: Remove soon to be illegal characters from test names
Tom Stellard
tom at stellard.net
Thu Dec 6 14:14:49 PST 2012
From: Tom Stellard <thomas.stellard at amd.com>
---
tests/cl/program/execute/scalar-arithmetic-char.cl | 18 +++++++--------
.../cl/program/execute/scalar-arithmetic-float.cl | 26 +++++++++++-----------
tests/cl/program/execute/scalar-arithmetic-int.cl | 18 +++++++--------
tests/cl/program/execute/scalar-arithmetic-long.cl | 18 +++++++--------
.../cl/program/execute/scalar-arithmetic-short.cl | 18 +++++++--------
.../cl/program/execute/scalar-arithmetic-uchar.cl | 6 ++---
tests/cl/program/execute/scalar-arithmetic-uint.cl | 6 ++---
.../cl/program/execute/scalar-arithmetic-ulong.cl | 6 ++---
.../cl/program/execute/scalar-arithmetic-ushort.cl | 6 ++---
.../execute/vector-arithmetic-float4.program_test | 6 ++---
.../execute/vector-arithmetic-int4.program_test | 10 ++++-----
11 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/tests/cl/program/execute/scalar-arithmetic-char.cl b/tests/cl/program/execute/scalar-arithmetic-char.cl
index 8b301e6..3aaf14d 100644
--- a/tests/cl/program/execute/scalar-arithmetic-char.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-char.cl
@@ -106,63 +106,63 @@ arg_out: 0 buffer char[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 char 8
arg_in: 2 char 4
arg_out: 0 buffer char[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 char 7
arg_in: 2 char 4
arg_out: 0 buffer char[1] 1
[test]
-name: pos/neg
+name: pos div neg
kernel_name: div
arg_in: 1 char 8
arg_in: 2 char -4
arg_out: 0 buffer char[1] -2
[test]
-name: pos/neg (remainder)
+name: pos div neg (remainder)
kernel_name: div
arg_in: 1 char 8
arg_in: 2 char -3
arg_out: 0 buffer char[1] -2
[test]
-name: neg/pos
+name: neg div pos
kernel_name: div
arg_in: 1 char -20
arg_in: 2 char 5
arg_out: 0 buffer char[1] -4
[test]
-name: neg/pos (remainder)
+name: neg div pos (remainder)
kernel_name: div
arg_in: 1 char -2
arg_in: 2 char 5
arg_out: 0 buffer char[1] 0
[test]
-name: neg/neg
+name: neg div neg
kernel_name: div
arg_in: 1 char -9
arg_in: 2 char -3
arg_out: 0 buffer char[1] 3
[test]
-name: neg/neg (remainder)
+name: neg div neg (remainder)
kernel_name: div
arg_in: 1 char -8
arg_in: 2 char -3
arg_out: 0 buffer char[1] 2
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 char 0
arg_in: 2 char -3
diff --git a/tests/cl/program/execute/scalar-arithmetic-float.cl b/tests/cl/program/execute/scalar-arithmetic-float.cl
index 110eda5..33a44d4 100644
--- a/tests/cl/program/execute/scalar-arithmetic-float.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-float.cl
@@ -174,91 +174,91 @@ arg_out: 0 buffer float[1] nan
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 float 8.5
arg_in: 2 float 4.25
arg_out: 0 buffer float[1] 2
[test]
-name: pos/neg
+name: pos div neg
kernel_name: div
arg_in: 1 float 11.25
arg_in: 2 float -3
arg_out: 0 buffer float[1] -3.75
[test]
-name: neg/pos
+name: neg div pos
kernel_name: div
arg_in: 1 float -21
arg_in: 2 float 5.25
arg_out: 0 buffer float[1] -4
[test]
-name: neg/neg
+name: neg div neg
kernel_name: div
arg_in: 1 float -21.25
arg_in: 2 float -5
arg_out: 0 buffer float[1] 4.25
[test]
-name: 0/pos
+name: 0 div pos
kernel_name: div
arg_in: 1 float 0
arg_in: 2 float 3.7
arg_out: 0 buffer float[1] 0
[test]
-name: 0/neg
+name: 0 div neg
kernel_name: div
arg_in: 1 float 0
arg_in: 2 float -3.7
arg_out: 0 buffer float[1] -0
[test]
-name: num/0
+name: num div 0
kernel_name: div
arg_in: 1 float 45.25
arg_in: 2 float 0
arg_out: 0 buffer float[1] inf
[test]
-name: -num/0
+name: -num div 0
kernel_name: div
arg_in: 1 float -45.25
arg_in: 2 float 0
arg_out: 0 buffer float[1] -inf
[test]
-name: 0/inf
+name: 0 div inf
kernel_name: div
arg_in: 1 float 0
arg_in: 2 float inf
arg_out: 0 buffer float[1] 0
[test]
-name: inf/0
+name: inf div 0
kernel_name: div
arg_in: 1 float inf
arg_in: 2 float 0
arg_out: 0 buffer float[1] inf
[test]
-name: inf/inf
+name: inf div inf
kernel_name: div
arg_in: 1 float inf
arg_in: 2 float inf
arg_out: 0 buffer float[1] nan
[test]
-name: num/nan
+name: num div nan
kernel_name: div
arg_in: 1 float 234.5
arg_in: 2 float nan
arg_out: 0 buffer float[1] nan
[test]
-name: nan/0
+name: nan div 0
kernel_name: div
arg_in: 1 float nan
arg_in: 2 float 0
diff --git a/tests/cl/program/execute/scalar-arithmetic-int.cl b/tests/cl/program/execute/scalar-arithmetic-int.cl
index bd2f8be..069de62 100644
--- a/tests/cl/program/execute/scalar-arithmetic-int.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-int.cl
@@ -106,63 +106,63 @@ arg_out: 0 buffer int[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 int 8
arg_in: 2 int 4
arg_out: 0 buffer int[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 int 7
arg_in: 2 int 4
arg_out: 0 buffer int[1] 1
[test]
-name: pos/neg
+name: pos div neg
kernel_name: div
arg_in: 1 int 8
arg_in: 2 int -4
arg_out: 0 buffer int[1] -2
[test]
-name: pos/neg (remainder)
+name: pos div neg (remainder)
kernel_name: div
arg_in: 1 int 8
arg_in: 2 int -3
arg_out: 0 buffer int[1] -2
[test]
-name: neg/pos
+name: neg div pos
kernel_name: div
arg_in: 1 int -20
arg_in: 2 int 5
arg_out: 0 buffer int[1] -4
[test]
-name: neg/pos (remainder)
+name: neg div pos (remainder)
kernel_name: div
arg_in: 1 int -2
arg_in: 2 int 5
arg_out: 0 buffer int[1] 0
[test]
-name: neg/neg
+name: neg div neg
kernel_name: div
arg_in: 1 int -9
arg_in: 2 int -3
arg_out: 0 buffer int[1] 3
[test]
-name: neg/neg (remainder)
+name: neg div neg (remainder)
kernel_name: div
arg_in: 1 int -8
arg_in: 2 int -3
arg_out: 0 buffer int[1] 2
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 int 0
arg_in: 2 int -3
diff --git a/tests/cl/program/execute/scalar-arithmetic-long.cl b/tests/cl/program/execute/scalar-arithmetic-long.cl
index 759701a..08791fd 100644
--- a/tests/cl/program/execute/scalar-arithmetic-long.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-long.cl
@@ -106,63 +106,63 @@ arg_out: 0 buffer long[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 long 8
arg_in: 2 long 4
arg_out: 0 buffer long[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 long 7
arg_in: 2 long 4
arg_out: 0 buffer long[1] 1
[test]
-name: pos/neg
+name: pos div neg
kernel_name: div
arg_in: 1 long 8
arg_in: 2 long -4
arg_out: 0 buffer long[1] -2
[test]
-name: pos/neg (remainder)
+name: pos div neg (remainder)
kernel_name: div
arg_in: 1 long 8
arg_in: 2 long -3
arg_out: 0 buffer long[1] -2
[test]
-name: neg/pos
+name: neg div pos
kernel_name: div
arg_in: 1 long -20
arg_in: 2 long 5
arg_out: 0 buffer long[1] -4
[test]
-name: neg/pos (remainder)
+name: neg div pos (remainder)
kernel_name: div
arg_in: 1 long -2
arg_in: 2 long 5
arg_out: 0 buffer long[1] 0
[test]
-name: neg/neg
+name: neg div neg
kernel_name: div
arg_in: 1 long -9
arg_in: 2 long -3
arg_out: 0 buffer long[1] 3
[test]
-name: neg/neg (remainder)
+name: neg div neg (remainder)
kernel_name: div
arg_in: 1 long -8
arg_in: 2 long -3
arg_out: 0 buffer long[1] 2
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 long 0
arg_in: 2 long -3
diff --git a/tests/cl/program/execute/scalar-arithmetic-short.cl b/tests/cl/program/execute/scalar-arithmetic-short.cl
index 4867923..4b1f595 100644
--- a/tests/cl/program/execute/scalar-arithmetic-short.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-short.cl
@@ -106,63 +106,63 @@ arg_out: 0 buffer short[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 short 8
arg_in: 2 short 4
arg_out: 0 buffer short[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 short 7
arg_in: 2 short 4
arg_out: 0 buffer short[1] 1
[test]
-name: pos/neg
+name: pos div neg
kernel_name: div
arg_in: 1 short 8
arg_in: 2 short -4
arg_out: 0 buffer short[1] -2
[test]
-name: pos/neg (remainder)
+name: pos div neg (remainder)
kernel_name: div
arg_in: 1 short 8
arg_in: 2 short -3
arg_out: 0 buffer short[1] -2
[test]
-name: neg/pos
+name: neg div pos
kernel_name: div
arg_in: 1 short -20
arg_in: 2 short 5
arg_out: 0 buffer short[1] -4
[test]
-name: neg/pos (remainder)
+name: neg div pos (remainder)
kernel_name: div
arg_in: 1 short -2
arg_in: 2 short 5
arg_out: 0 buffer short[1] 0
[test]
-name: neg/neg
+name: neg div neg
kernel_name: div
arg_in: 1 short -9
arg_in: 2 short -3
arg_out: 0 buffer short[1] 3
[test]
-name: neg/neg (remainder)
+name: neg div neg (remainder)
kernel_name: div
arg_in: 1 short -8
arg_in: 2 short -3
arg_out: 0 buffer short[1] 2
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 short 0
arg_in: 2 short -3
diff --git a/tests/cl/program/execute/scalar-arithmetic-uchar.cl b/tests/cl/program/execute/scalar-arithmetic-uchar.cl
index 821218c..d1c5243 100644
--- a/tests/cl/program/execute/scalar-arithmetic-uchar.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-uchar.cl
@@ -57,21 +57,21 @@ arg_out: 0 buffer uchar[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 uchar 8
arg_in: 2 uchar 4
arg_out: 0 buffer uchar[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 uchar 7
arg_in: 2 uchar 4
arg_out: 0 buffer uchar[1] 1
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 uchar 0
arg_in: 2 uchar 77
diff --git a/tests/cl/program/execute/scalar-arithmetic-uint.cl b/tests/cl/program/execute/scalar-arithmetic-uint.cl
index a77f6fc..30bbd12 100644
--- a/tests/cl/program/execute/scalar-arithmetic-uint.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-uint.cl
@@ -57,21 +57,21 @@ arg_out: 0 buffer uint[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 uint 8
arg_in: 2 uint 4
arg_out: 0 buffer uint[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 uint 7
arg_in: 2 uint 4
arg_out: 0 buffer uint[1] 1
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 uint 0
arg_in: 2 uint 77
diff --git a/tests/cl/program/execute/scalar-arithmetic-ulong.cl b/tests/cl/program/execute/scalar-arithmetic-ulong.cl
index 1082163..dfb4d1e 100644
--- a/tests/cl/program/execute/scalar-arithmetic-ulong.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-ulong.cl
@@ -57,21 +57,21 @@ arg_out: 0 buffer ulong[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 ulong 8
arg_in: 2 ulong 4
arg_out: 0 buffer ulong[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 ulong 7
arg_in: 2 ulong 4
arg_out: 0 buffer ulong[1] 1
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 ulong 0
arg_in: 2 ulong 77
diff --git a/tests/cl/program/execute/scalar-arithmetic-ushort.cl b/tests/cl/program/execute/scalar-arithmetic-ushort.cl
index db1333d..38883ba 100644
--- a/tests/cl/program/execute/scalar-arithmetic-ushort.cl
+++ b/tests/cl/program/execute/scalar-arithmetic-ushort.cl
@@ -57,21 +57,21 @@ arg_out: 0 buffer ushort[1] 0
## Division ##
[test]
-name: pos/pos
+name: pos div pos
kernel_name: div
arg_in: 1 ushort 8
arg_in: 2 ushort 4
arg_out: 0 buffer ushort[1] 2
[test]
-name: pos/pos (remainder)
+name: pos div pos (remainder)
kernel_name: div
arg_in: 1 ushort 7
arg_in: 2 ushort 4
arg_out: 0 buffer ushort[1] 1
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 ushort 0
arg_in: 2 ushort 77
diff --git a/tests/cl/program/execute/vector-arithmetic-float4.program_test b/tests/cl/program/execute/vector-arithmetic-float4.program_test
index 610500e..db859cf 100644
--- a/tests/cl/program/execute/vector-arithmetic-float4.program_test
+++ b/tests/cl/program/execute/vector-arithmetic-float4.program_test
@@ -87,21 +87,21 @@ arg_out: 0 buffer float4[1] nan nan nan nan
## Division ##
[test]
-name: pos/pos, neg/neg, pos/neg, neg/pos
+name: pos div pos, neg div neg, pos div neg, neg div pos
kernel_name: div
arg_in: 1 float4 8.5 -21.25 11.25 -21
arg_in: 2 float4 4.25 -5 -3 5.25
arg_out: 0 buffer float4[1] 2 4.25 -3.75 -4
[test]
-name: 0/pos, 0/neg, pos/0, neg/0
+name: 0 div pos, 0 div neg, pos div 0, neg div 0
kernel_name: div
arg_in: 1 float4 0 0 11.25 -21
arg_in: 2 float4 4.25 -5 0 0
arg_out: 0 buffer float4[1] 0 0 inf -inf
[test]
-name: 0/inf, inf/0, inf/inf, nan/0
+name: 0 div inf, inf div 0, inf div inf, nan div 0
kernel_name: div
arg_in: 1 float4 0 inf inf nan
arg_in: 2 float4 inf 0 inf 0
diff --git a/tests/cl/program/execute/vector-arithmetic-int4.program_test b/tests/cl/program/execute/vector-arithmetic-int4.program_test
index 7868969..c8fc1c7 100644
--- a/tests/cl/program/execute/vector-arithmetic-int4.program_test
+++ b/tests/cl/program/execute/vector-arithmetic-int4.program_test
@@ -66,35 +66,35 @@ arg_out: 0 buffer int4[1] 0 0 0 0
## Division ##
[test]
-name: pos/pos, pos/pos (remainder)
+name: pos div pos, pos div pos (remainder)
kernel_name: div
arg_in: 1 int4 8 33 7 12
arg_in: 2 int4 4 11 4 5
arg_out: 0 buffer int4[1] 2 3 1 2
[test]
-name: pos/neg, pos/neg (remainder)
+name: pos div neg, pos div neg (remainder)
kernel_name: div
arg_in: 1 int4 9 0 8 33
arg_in: 2 int4 -3 -6 -3 -5
arg_out: 0 buffer int4[1] -3 0 -2 -6
[test]
-name: neg/pos, neg/pos (remainder)
+name: neg div pos, neg div pos (remainder)
kernel_name: div
arg_in: 1 int4 -5 -10 -2 -30
arg_in: 2 int4 5 2 5 7
arg_out: 0 buffer int4[1] -1 -5 0 -4
[test]
-name: neg/meg, neg/neg (remainder)
+name: neg div meg, neg div neg (remainder)
kernel_name: div
arg_in: 1 int4 -8 -12 -8 -23
arg_in: 2 int4 -4 -3 -3 -7
arg_out: 0 buffer int4[1] 2 4 2 3
[test]
-name: 0/num
+name: 0 div num
kernel_name: div
arg_in: 1 int4 0 0 0 0
arg_in: 2 int4 -3 5 -4 33
--
1.7.11.4
More information about the Piglit
mailing list