Update CTS csv files. (#971)

* This removes API specific csv files, as these are no longer required.

This also updates opencl_conformance_tests_quick.csv to include >= 2.0 tests.

No changes were required for opencl_conformance_tests_full.csv.

Addresses #863

* Pass the correct arguments to test_spirv_new.

test_conformance/opencl_conformance_tests_quick.csv

@@ -32,7 +32,7 @@ Atomics,atomics/test_atomics
 Profiling,profiling/test_profiling
 Events,events/test_events
 Allocations (single maximum),allocations/test_allocations single 5 all
-Allocations (total maximum),allocations/test_allocations multiple 5 all 
+Allocations (total maximum),allocations/test_allocations multiple 5 all
 Printf,printf/test_printf
 Device Partitioning,device_partition/test_device_partition
 
@@ -40,22 +40,22 @@ Device Partitioning,device_partition/test_device_partition
 # Buffers and images
 # #########################################
 Buffers,buffers/test_buffers
-Images (API Info),images/clGetInfo/test_cl_get_info 
-Images (Kernel Methods),images/kernel_image_methods/test_kernel_image_methods 
+Images (API Info),images/clGetInfo/test_cl_get_info
+Images (Kernel Methods),images/kernel_image_methods/test_kernel_image_methods
 Images (Kernel),images/kernel_read_write/test_image_streams CL_FILTER_NEAREST
 Images (Kernel pitch),images/kernel_read_write/test_image_streams use_pitches CL_FILTER_NEAREST
 Images (Kernel max size),images/kernel_read_write/test_image_streams max_images CL_FILTER_NEAREST
 Images (clCopyImage),images/clCopyImage/test_cl_copy_images
-Images (clCopyImage max size),images/clCopyImage/test_cl_copy_images max_images 
-Images (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images 
-Images (clReadWriteImage pitch),images/clReadWriteImage/test_cl_read_write_images use_pitches 
-Images (clReadWriteImage max size),images/clReadWriteImage/test_cl_read_write_images max_images 
-Images (clFillImage),images/clFillImage/test_cl_fill_images 
-Images (clFillImage pitch),images/clFillImage/test_cl_fill_images use_pitches 
-Images (clFillImage max size),images/clFillImage/test_cl_fill_images max_images 
-Images (Samplerless),images/samplerlessReads/test_samplerless_reads 
-Images (Samplerless pitch),images/samplerlessReads/test_samplerless_reads use_pitches 
-Images (Samplerless max size),images/samplerlessReads/test_samplerless_reads max_images 
+Images (clCopyImage max size),images/clCopyImage/test_cl_copy_images max_images
+Images (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images
+Images (clReadWriteImage pitch),images/clReadWriteImage/test_cl_read_write_images use_pitches
+Images (clReadWriteImage max size),images/clReadWriteImage/test_cl_read_write_images max_images
+Images (clFillImage),images/clFillImage/test_cl_fill_images
+Images (clFillImage pitch),images/clFillImage/test_cl_fill_images use_pitches
+Images (clFillImage max size),images/clFillImage/test_cl_fill_images max_images
+Images (Samplerless),images/samplerlessReads/test_samplerless_reads
+Images (Samplerless pitch),images/samplerlessReads/test_samplerless_reads use_pitches
+Images (Samplerless max size),images/samplerlessReads/test_samplerless_reads max_images
 Mem (Host Flags),mem_host_flags/test_mem_host_flags
 
 # #########################################
@@ -79,3 +79,29 @@ Contractions,contractions/test_contractions
 Math,math_brute_force/test_bruteforce -w
 Integer Ops,integer_ops/test_integer_ops integer_* quick_*
 Half Ops,half/test_half -w
+
+#####################################
+# OpenCL 2.0 tests
+#####################################
+C11 Atomics,c11_atomics/test_c11_atomics
+Execution Model,device_execution/test_device_execution
+Generic Address Space,generic_address_space/test_generic_address_space
+Non Uniform Work Groups,non_uniform_work_group/test_non_uniform_work_group
+Pipes,pipes/test_pipes
+SVM,SVM/test_svm
+Workgroups,workgroups/test_workgroups
+
+#####################################
+# OpenCL 2.1 tests
+#####################################
+Device timer,device_timer/test_device_timer
+SPIRV new,spirv_new/test_spirv_new --spirv-binaries-path spirv_bin
+
+#########################################
+# Extensions
+#########################################
+SPIR,spir/test_spir
+Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FILTER_NEAREST
+Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
+Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
+Subgroups,subgroups/test_subgroups