[OpenCL] Fix code generation of kernel pipe parameters.

[bader]

Summary

Improved test with user define structure pipe type case.

[Anastasia]

LGTM!

lib/CodeGen/CodeGenFunction.cpp

535

I am guessing this is output of clang-format, looks a bit strange though...

[bader]

Re-format the patch.
No functional changes.

[bader]

Ping.
Xiuli, do you have any comments?

[pxli168]

Sorry for the late reply, I was busy with some backend problem.
LGTM, thanks for the fix!

lib/CodeGen/CodeGenFunction.cpp

if (ty->isPointerType()) {
           CGM.getContext().getTargetAddressSpace(LangAS::opencl_global);
 
       addressQuals.push_back(
           llvm::ConstantAsMetadata::get(Builder.getInt32(AddrSpc)));
 
       // Get argument type name.
       std::string typeName;
       if (isPipe)
-        typeName = cast<PipeType>(ty)->getElementType().getAsString(Policy);
+        typeName = ty.getCanonicalType()
+                       ->getAs<PipeType>()
+                       ->getElementType()
+                       .getAsString(Policy);
       else
         typeName = ty.getUnqualifiedType().getAsString(Policy);
 
       // Turn "unsigned type" to "utype"
       std::string::size_type pos = typeName.find("unsigned");
       if (ty.isCanonical() && pos != std::string::npos)
         typeName.erase(pos+1, 8);
 
       argTypeNames.push_back(llvm::MDString::get(Context, typeName));
 
       std::string baseTypeName;
       if (isPipe)
-        baseTypeName =
-          cast<PipeType>(ty)->getElementType().getCanonicalType().getAsString(Policy);
+        baseTypeName = ty.getCanonicalType()
+                           ->getAs<PipeType>()
+                           ->getElementType()
+                           .getCanonicalType()
+                           .getAsString(Policy);
       else
         baseTypeName =
           ty.getUnqualifiedType().getCanonicalType().getAsString(Policy);
 
       // Turn "unsigned type" to "utype"
       pos = baseTypeName.find("unsigned");
       if (pos != std::string::npos)
         baseTypeName.erase(pos+1, 8);

test/CodeGenOpenCL/pipe_types.cl

 
 void test4(read_only pipe uchar3 p) {
 // CHECK: define void @test4(%opencl.pipe_t* %p)
 }
 
 void test5(read_only pipe int4 p) {
 // CHECK: define void @test5(%opencl.pipe_t* %p)
 }
+
+typedef pipe int MyPipe;
+kernel void test6(read_only MyPipe p) {
+// CHECK: define void @test6(%opencl.pipe_t* %p)
+}
+
+struct Person {
+  const char *Name;
+  bool isFemale;
+  int ID;
+};
+
+void test_reserved_read_pipe(global struct Person *SDst,
+                             read_only pipe struct Person SPipe) {
+// CHECK: define void @test_reserved_read_pipe
+  read_pipe (SPipe, SDst);
+  // CHECK: call i32 @__read_pipe_2(%opencl.pipe_t* %{{.*}}, i8* %{{.*}})
+  read_pipe (SPipe, SDst);
+  // CHECK: call i32 @__read_pipe_2(%opencl.pipe_t* %{{.*}}, i8* %{{.*}})
+}