[Piglit] [PATCH] Remove clc_version_min requirement on scalar-load-[float|uchar].cl tests

Aaron Watry awatry at gmail.com
Mon Nov 26 18:06:55 PST 2012


Nothing in these tests should require CL C 1.1.

If the tests were attempting to WRITE to a global char*/short*,
then cl_khr_byte_addressable_store or CL1.1 (not CLC 1.1) would be required.

Also added a param/constant test case to the uchar file so that it's
consistent with the float tests.
---
 tests/cl/program/execute/scalar-load-float.cl |    1 -
 tests/cl/program/execute/scalar-load-uchar.cl |   26 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/cl/program/execute/scalar-load-float.cl b/tests/cl/program/execute/scalar-load-float.cl
index 8442c06..0df9862 100644
--- a/tests/cl/program/execute/scalar-load-float.cl
+++ b/tests/cl/program/execute/scalar-load-float.cl
@@ -1,7 +1,6 @@
 /*!
 [config]
 name: Scalar load float
-clc_version_min: 11
 
 [test]
 kernel_name: load_global
diff --git a/tests/cl/program/execute/scalar-load-uchar.cl b/tests/cl/program/execute/scalar-load-uchar.cl
index 2b6d910..3faa285 100644
--- a/tests/cl/program/execute/scalar-load-uchar.cl
+++ b/tests/cl/program/execute/scalar-load-uchar.cl
@@ -1,15 +1,35 @@
 /*!
 [config]
 name: Scalar load uchar
-clc_version_min: 11
-kernel_name: uchar_load
 
 [test]
 name: global address space
+kernel_name: uchar_load_global
 arg_out: 0 buffer uint[1] 5
 arg_in:  1 buffer uchar[1] 5
+
+[test]
+name: parameter address space
+kernel_name: uchar_load_param
+arg_out: 0 buffer uint[1] 6
+arg_in:  1 uchar 6
+
+[test]
+name: constant address space
+kernel_name: uchar_load_constant
+arg_out: 0 buffer uint[1] 7
+arg_in:  1 buffer uchar[1] 7
+
 !*/
 
-kernel void uchar_load(global uint *out, global uchar *in) {
+kernel void uchar_load_global(global uint *out, global uchar *in) {
+	out[0] = in[0];
+}
+
+kernel void uchar_load_param(global uint *out, uchar in) {
+	out[0] = in;
+}
+
+kernel void uchar_load_constant(global uint *out, constant uchar *in) {
 	out[0] = in[0];
 }
-- 
1.7.10.4



More information about the Piglit mailing list