Remove renaming artifacts

Signed-off-by: Dmitry Sidorov <[email protected]>

Author: MrSidims

clang/include/clang/AST/Type.h

@@ -480,8 +480,10 @@ class Qualifiers {
            // Otherwise in OpenCLC v2.0 s6.5.5: every address space except
            // for __constant can be used as __generic.
            (A == LangAS::opencl_generic && B != LangAS::opencl_constant) ||
-           // For USM extension we define global_device and global_host address
-           // spaces, which are a subset of __global.
+           // We also define global_device and global_host address spaces,
+           // to distinguish global pointers allocated on host to pointers
+           // allocated on device, which are a subset of __global.
+           // FIXME: add a reference to spec when ready
            (A == LangAS::opencl_global && (B == LangAS::opencl_global_device ||
                                            B == LangAS::opencl_global_host)) ||
            // Consider pointer size address spaces to be equivalent to default.

clang/include/clang/Basic/Attr.td

@@ -1296,12 +1296,12 @@ def OpenCLGlobalAddressSpace : TypeAttr {
 
 def OpenCLGlobalDeviceAddressSpace : TypeAttr {
   let Spellings = [Clang<"opencl_global_device">];
-  let Documentation = [OpenCLUSMAddressSpacesDocs];
+  let Documentation = [OpenCLGlobalAddressSpacesDocs];
 }
 
 def OpenCLGlobalHostAddressSpace : TypeAttr {
   let Spellings = [Clang<"opencl_global_host">];
-  let Documentation = [OpenCLUSMAddressSpacesDocs];
+  let Documentation = [OpenCLGlobalAddressSpacesDocs];
 }
 
 def OpenCLLocalAddressSpace : TypeAttr {

clang/include/clang/Basic/AttrDocs.td

@@ -3559,7 +3559,7 @@ scope) variables and static local variable as well.
   }];
 }
 
-def OpenCLUSMAddressSpacesDocs : Documentation {
+def OpenCLGlobalAddressSpacesDocs : Documentation {
   let Category = DocOpenCLAddressSpaces;
   let Heading = "[[clang::opencl_global_device]], [[clang::opencl_global_host]]";
   let Content = [{

clang/lib/AST/ItaniumMangle.cpp

@@ -2393,10 +2393,10 @@ void CXXNameMangler::mangleQualifiers(Qualifiers Quals, const DependentAddressSp
         ASString = "CLglobal";
         break;
       case LangAS::opencl_global_device:
-        ASString = "CLUSMDevice";
+        ASString = "CLDevice";
         break;
       case LangAS::opencl_global_host:
-        ASString = "CLUSMHost";
+        ASString = "CLHost";
         break;
       case LangAS::opencl_local:
         ASString = "CLlocal";

clang/lib/AST/MicrosoftMangle.cpp

@@ -1824,10 +1824,10 @@ void MicrosoftCXXNameMangler::mangleAddressSpaceType(QualType T,
       Extra.mangleSourceName("_ASCLglobal");
       break;
     case LangAS::opencl_global_device:
-      Extra.mangleSourceName("_ASCLUSMDevice");
+      Extra.mangleSourceName("_ASCLDevice");
       break;
     case LangAS::opencl_global_host:
-      Extra.mangleSourceName("_ASCLUSMHost");
+      Extra.mangleSourceName("_ASCLHost");
       break;
     case LangAS::opencl_local:
       Extra.mangleSourceName("_ASCLlocal");

clang/test/CodeGenCXX/mangle-address-space.cpp

@@ -66,11 +66,11 @@ __constant float *ocl_f1(char __generic const *p) { return 0;}
 // WINOCL-LABEL: define {{.*}}float* @"?ocl_f2@@YAPEAU?$_ASCLgeneric@$$CAM@__clang@@QEAU?$_ASCLgeneric@$$CBD@2@@Z"
 __generic float *ocl_f2(__generic char const * const p) { return 0;}
 
-// CHECKOCL-LABEL: define {{.*}}void @_Z6ocl_f3PU9CLUSMHost14ocl_OpaqueType
-// WINOCL-LABEL: define {{.*}}void @"?ocl_f3@@YAXPEAU?$_ASCLUSMHost@$$CAUocl_OpaqueType@@@__clang@@@Z"
+// CHECKOCL-LABEL: define {{.*}}void @_Z6ocl_f3PU6CLHost14ocl_OpaqueType
+// WINOCL-LABEL: define {{.*}}void @"?ocl_f3@@YAXPEAU?$_ASCLHost@$$CAUocl_OpaqueType@@@__clang@@@Z"
 void ocl_f3(ocl_OpaqueTypePtrH) {}
 
-// CHECKOCL-LABEL: define {{.*}}void @_Z6ocl_f4PU11CLUSMDevice14ocl_OpaqueType
-// WINOCL-LABEL: define {{.*}}void @"?ocl_f4@@YAXPEAU?$_ASCLUSMDevice@$$CAUocl_OpaqueType@@@__clang@@@Z"
+// CHECKOCL-LABEL: define {{.*}}void @_Z6ocl_f4PU8CLDevice14ocl_OpaqueType
+// WINOCL-LABEL: define {{.*}}void @"?ocl_f4@@YAXPEAU?$_ASCLDevice@$$CAUocl_OpaqueType@@@__clang@@@Z"
 void ocl_f4(ocl_OpaqueTypePtrD) {}
 #endif