OpenCL: standardise naming of test cases

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125590 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/CodeGen/cl-single-precision-constant.c b/test/CodeGen/cl-single-precision-constant.c
deleted file mode 100644
index adde193..0000000
--- a/test/CodeGen/cl-single-precision-constant.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// RUN: %clang_cc1 %s -x cl -cl-single-precision-constant -emit-llvm -o - | FileCheck %s
-
-float fn(float f) {
-  // CHECK: fmul float
-  // CHECK: fadd float
-  return f*2. + 1.;
-}
diff --git a/test/CodeGen/ext-vector-shuffle.c b/test/CodeGen/ext-vector-shuffle.c
deleted file mode 100644
index d26602a..0000000
--- a/test/CodeGen/ext-vector-shuffle.c
+++ /dev/null
@@ -1,17 +0,0 @@
-// RUN: %clang_cc1 %s -x cl -cl-opt-disable -emit-llvm -o - | not grep 'extractelement'
-// RUN: %clang_cc1 %s -x cl -cl-opt-disable -emit-llvm -o - | not grep 'insertelement'
-// RUN: %clang_cc1 %s -x cl -cl-opt-disable -emit-llvm -o - | grep 'shufflevector'
-
-typedef __attribute__(( ext_vector_type(2) )) float float2;
-typedef __attribute__(( ext_vector_type(4) )) float float4;
-
-float2 test1(float4 V) {
-  return V.xy + V.wz;
-}
-
-float4 test2(float4 V) {
-  float2 W = V.ww;
-  return W.xyxy + W.yxyx;
-}
-
-float4 test3(float4 V1, float4 V2) { return (float4)(V1.zw, V2.xy); }
diff --git a/test/CodeGenOpenCL/ext-vector-shuffle.cl b/test/CodeGenOpenCL/ext-vector-shuffle.cl
new file mode 100644
index 0000000..ee88ba3
--- /dev/null
+++ b/test/CodeGenOpenCL/ext-vector-shuffle.cl
@@ -0,0 +1,17 @@
+// RUN: %clang_cc1 %s -cl-opt-disable -emit-llvm -o - | not grep 'extractelement'
+// RUN: %clang_cc1 %s -cl-opt-disable -emit-llvm -o - | not grep 'insertelement'
+// RUN: %clang_cc1 %s -cl-opt-disable -emit-llvm -o - | grep 'shufflevector'
+
+typedef __attribute__(( ext_vector_type(2) )) float float2;
+typedef __attribute__(( ext_vector_type(4) )) float float4;
+
+float2 test1(float4 V) {
+  return V.xy + V.wz;
+}
+
+float4 test2(float4 V) {
+  float2 W = V.ww;
+  return W.xyxy + W.yxyx;
+}
+
+float4 test3(float4 V1, float4 V2) { return (float4)(V1.zw, V2.xy); }
diff --git a/test/CodeGenOpenCL/single-precision-constant.cl b/test/CodeGenOpenCL/single-precision-constant.cl
new file mode 100644
index 0000000..62b37c1
--- /dev/null
+++ b/test/CodeGenOpenCL/single-precision-constant.cl
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 %s -cl-single-precision-constant -emit-llvm -o - | FileCheck %s
+
+float fn(float f) {
+  // CHECK: fmul float
+  // CHECK: fadd float
+  return f*2. + 1.;
+}
diff --git a/test/Parser/cl_storage_class.cl b/test/Parser/opencl-storage-class.cl
similarity index 89%
rename from test/Parser/cl_storage_class.cl
rename to test/Parser/opencl-storage-class.cl
index 5db8f4b..d479358 100644
--- a/test/Parser/cl_storage_class.cl
+++ b/test/Parser/opencl-storage-class.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -x cl -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
 
 void test_storage_class_specs()
 {
diff --git a/test/Sema/opencl-cond.c b/test/SemaOpenCL/cond.cl
similarity index 68%
rename from test/Sema/opencl-cond.c
rename to test/SemaOpenCL/cond.cl
index d654a15..79dc82d 100644
--- a/test/Sema/opencl-cond.c
+++ b/test/SemaOpenCL/cond.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -x cl -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
 
 typedef __attribute__((ext_vector_type(4))) float float4;
 
diff --git a/test/Sema/opencl-init.c b/test/SemaOpenCL/init.cl
similarity index 84%
rename from test/Sema/opencl-init.c
rename to test/SemaOpenCL/init.cl
index 3d116bd..b3ecfec 100644
--- a/test/Sema/opencl-init.c
+++ b/test/SemaOpenCL/init.cl
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -x cl -verify -pedantic -fsyntax-only
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only
 
 typedef float float8 __attribute((ext_vector_type(8)));