Index: clang/include/clang/AST/Type.h =================================================================== --- clang/include/clang/AST/Type.h +++ clang/include/clang/AST/Type.h @@ -480,6 +480,11 @@ // 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) || + // We also define global_device and global_host address spaces, + // to distinguish global pointers allocated on host from pointers + // allocated on device, which are a subset of __global. + (A == LangAS::opencl_global && (B == LangAS::opencl_global_device || + B == LangAS::opencl_global_host)) || // Consider pointer size address spaces to be equivalent to default. ((isPtrSizeAddressSpace(A) || A == LangAS::Default) && (isPtrSizeAddressSpace(B) || B == LangAS::Default)); Index: clang/include/clang/Basic/AddressSpaces.h =================================================================== --- clang/include/clang/Basic/AddressSpaces.h +++ clang/include/clang/Basic/AddressSpaces.h @@ -36,6 +36,8 @@ opencl_constant, opencl_private, opencl_generic, + opencl_global_device, + opencl_global_host, // CUDA specific address spaces. cuda_device, Index: clang/include/clang/Basic/Attr.td =================================================================== --- clang/include/clang/Basic/Attr.td +++ clang/include/clang/Basic/Attr.td @@ -1178,6 +1178,16 @@ let Documentation = [OpenCLAddressSpaceGlobalDocs]; } +def OpenCLGlobalDeviceAddressSpace : TypeAttr { + let Spellings = [Clang<"opencl_global_device">]; + let Documentation = [OpenCLGlobalDeviceHostAddressSpacesDocs]; +} + +def OpenCLGlobalHostAddressSpace : TypeAttr { + let Spellings = [Clang<"opencl_global_host">]; + let Documentation = [OpenCLGlobalDeviceHostAddressSpacesDocs]; +} + def OpenCLLocalAddressSpace : TypeAttr { let Spellings = [Keyword<"__local">, Keyword<"local">, Clang<"opencl_local">]; let Documentation = [OpenCLAddressSpaceLocalDocs]; Index: clang/include/clang/Basic/AttrDocs.td =================================================================== --- clang/include/clang/Basic/AttrDocs.td +++ clang/include/clang/Basic/AttrDocs.td @@ -3123,6 +3123,27 @@ }]; } +def OpenCLGlobalDeviceHostAddressSpacesDocs : Documentation { + let Category = DocOpenCLAddressSpaces; + let Heading = "[[clang::opencl_global_device]], [[clang::opencl_global_host]]"; + let Content = [{ +The ``global_device`` and ``global_host`` address space attributes specify that +an object is allocated in global memory on the device/host. It helps to +distinguish USM (Unified Shared Memory) pointers that access global device +memory from those that access global host memory. These new address spaces are +a subset of the ``opencl_global`` address space, so address space scheme for +OpenCL 2.0 with the extension looks like: + generic->global->host + ->device + ->private + ->local + constant + +It is allowed to convert ``global_device`` and ``global_host`` address spaces to +``opencl_global`` address spaces. + }]; +} + def OpenCLAddressSpaceLocalDocs : Documentation { let Category = DocOpenCLAddressSpaces; let Heading = "__local, local, [[clang::opencl_local]]"; Index: clang/include/clang/Sema/ParsedAttr.h =================================================================== --- clang/include/clang/Sema/ParsedAttr.h +++ clang/include/clang/Sema/ParsedAttr.h @@ -606,6 +606,10 @@ return LangAS::opencl_constant; case ParsedAttr::AT_OpenCLGlobalAddressSpace: return LangAS::opencl_global; + case ParsedAttr::AT_OpenCLGlobalDeviceAddressSpace: + return LangAS::opencl_global_device; + case ParsedAttr::AT_OpenCLGlobalHostAddressSpace: + return LangAS::opencl_global_host; case ParsedAttr::AT_OpenCLLocalAddressSpace: return LangAS::opencl_local; case ParsedAttr::AT_OpenCLPrivateAddressSpace: Index: clang/lib/AST/ASTContext.cpp =================================================================== --- clang/lib/AST/ASTContext.cpp +++ clang/lib/AST/ASTContext.cpp @@ -919,18 +919,20 @@ // The fake address space map must have a distinct entry for each // language-specific address space. static const unsigned FakeAddrSpaceMap[] = { - 0, // Default - 1, // opencl_global - 3, // opencl_local - 2, // opencl_constant - 0, // opencl_private - 4, // opencl_generic - 5, // cuda_device - 6, // cuda_constant - 7, // cuda_shared - 8, // ptr32_sptr - 9, // ptr32_uptr - 10 // ptr64 + 0, // Default + 1, // opencl_global + 3, // opencl_local + 2, // opencl_constant + 0, // opencl_private + 4, // opencl_generic + 11, // opencl_global_device + 12, // opencl_global_host + 5, // cuda_device + 6, // cuda_constant + 7, // cuda_shared + 8, // ptr32_sptr + 9, // ptr32_uptr + 10 // ptr64 }; return &FakeAddrSpaceMap; } else { Index: clang/lib/AST/ItaniumMangle.cpp =================================================================== --- clang/lib/AST/ItaniumMangle.cpp +++ clang/lib/AST/ItaniumMangle.cpp @@ -2388,16 +2388,39 @@ switch (AS) { default: llvm_unreachable("Not a language specific address space"); // ::= "CL" [ "global" | "local" | "constant" | - // "private"| "generic" ] - case LangAS::opencl_global: ASString = "CLglobal"; break; - case LangAS::opencl_local: ASString = "CLlocal"; break; - case LangAS::opencl_constant: ASString = "CLconstant"; break; - case LangAS::opencl_private: ASString = "CLprivate"; break; - case LangAS::opencl_generic: ASString = "CLgeneric"; break; + // "private"| "generic" | "global_device" | + // "global_host" ] + case LangAS::opencl_global: + ASString = "CLglobal"; + break; + case LangAS::opencl_global_device: + ASString = "CLDevice"; + break; + case LangAS::opencl_global_host: + ASString = "CLHost"; + break; + case LangAS::opencl_local: + ASString = "CLlocal"; + break; + case LangAS::opencl_constant: + ASString = "CLconstant"; + break; + case LangAS::opencl_private: + ASString = "CLprivate"; + break; + case LangAS::opencl_generic: + ASString = "CLgeneric"; + break; // ::= "CU" [ "device" | "constant" | "shared" ] - case LangAS::cuda_device: ASString = "CUdevice"; break; - case LangAS::cuda_constant: ASString = "CUconstant"; break; - case LangAS::cuda_shared: ASString = "CUshared"; break; + case LangAS::cuda_device: + ASString = "CUdevice"; + break; + case LangAS::cuda_constant: + ASString = "CUconstant"; + break; + case LangAS::cuda_shared: + ASString = "CUshared"; + break; // ::= [ "ptr32_sptr" | "ptr32_uptr" | "ptr64" ] case LangAS::ptr32_sptr: ASString = "ptr32_sptr"; Index: clang/lib/AST/MicrosoftMangle.cpp =================================================================== --- clang/lib/AST/MicrosoftMangle.cpp +++ clang/lib/AST/MicrosoftMangle.cpp @@ -1823,6 +1823,12 @@ case LangAS::opencl_global: Extra.mangleSourceName("_ASCLglobal"); break; + case LangAS::opencl_global_device: + Extra.mangleSourceName("_ASCLDevice"); + break; + case LangAS::opencl_global_host: + Extra.mangleSourceName("_ASCLHost"); + break; case LangAS::opencl_local: Extra.mangleSourceName("_ASCLlocal"); break; Index: clang/lib/AST/TypePrinter.cpp =================================================================== --- clang/lib/AST/TypePrinter.cpp +++ clang/lib/AST/TypePrinter.cpp @@ -1564,6 +1564,8 @@ case attr::OpenCLPrivateAddressSpace: case attr::OpenCLGlobalAddressSpace: + case attr::OpenCLGlobalDeviceAddressSpace: + case attr::OpenCLGlobalHostAddressSpace: case attr::OpenCLLocalAddressSpace: case attr::OpenCLConstantAddressSpace: case attr::OpenCLGenericAddressSpace: @@ -1863,6 +1865,10 @@ return "__constant"; case LangAS::opencl_generic: return "__generic"; + case LangAS::opencl_global_device: + return "__global_device"; + case LangAS::opencl_global_host: + return "__global_host"; case LangAS::cuda_device: return "__device__"; case LangAS::cuda_constant: Index: clang/lib/Basic/Targets/AMDGPU.cpp =================================================================== --- clang/lib/Basic/Targets/AMDGPU.cpp +++ clang/lib/Basic/Targets/AMDGPU.cpp @@ -46,6 +46,8 @@ Constant, // opencl_constant Private, // opencl_private Generic, // opencl_generic + Global, // opencl_global_device + Global, // opencl_global_host Global, // cuda_device Constant, // cuda_constant Local, // cuda_shared @@ -61,6 +63,8 @@ Constant, // opencl_constant Private, // opencl_private Generic, // opencl_generic + Global, // opencl_global_device + Global, // opencl_global_host Global, // cuda_device Constant, // cuda_constant Local, // cuda_shared Index: clang/lib/Basic/Targets/NVPTX.h =================================================================== --- clang/lib/Basic/Targets/NVPTX.h +++ clang/lib/Basic/Targets/NVPTX.h @@ -30,6 +30,8 @@ 0, // opencl_private // FIXME: generic has to be added to the target 0, // opencl_generic + 1, // opencl_global_device + 1, // opencl_global_host 1, // cuda_device 4, // cuda_constant 3, // cuda_shared Index: clang/lib/Basic/Targets/SPIR.h =================================================================== --- clang/lib/Basic/Targets/SPIR.h +++ clang/lib/Basic/Targets/SPIR.h @@ -22,18 +22,20 @@ namespace targets { static const unsigned SPIRAddrSpaceMap[] = { - 0, // Default - 1, // opencl_global - 3, // opencl_local - 2, // opencl_constant - 0, // opencl_private - 4, // opencl_generic - 0, // cuda_device - 0, // cuda_constant - 0, // cuda_shared - 0, // ptr32_sptr - 0, // ptr32_uptr - 0 // ptr64 + 0, // Default + 1, // opencl_global + 3, // opencl_local + 2, // opencl_constant + 0, // opencl_private + 4, // opencl_generic + 11, // opencl_global_device + 12, // opencl_global_host + 0, // cuda_device + 0, // cuda_constant + 0, // cuda_shared + 0, // ptr32_sptr + 0, // ptr32_uptr + 0 // ptr64 }; class LLVM_LIBRARY_VISIBILITY SPIRTargetInfo : public TargetInfo { Index: clang/lib/Basic/Targets/TCE.h =================================================================== --- clang/lib/Basic/Targets/TCE.h +++ clang/lib/Basic/Targets/TCE.h @@ -35,6 +35,8 @@ 4, // opencl_local 5, // opencl_constant 0, // opencl_private + 1, // opencl_global_device + 1, // opencl_global_host // FIXME: generic has to be added to the target 0, // opencl_generic 0, // cuda_device Index: clang/lib/Basic/Targets/X86.h =================================================================== --- clang/lib/Basic/Targets/X86.h +++ clang/lib/Basic/Targets/X86.h @@ -30,6 +30,8 @@ 0, // opencl_constant 0, // opencl_private 0, // opencl_generic + 0, // opencl_global_device + 0, // opencl_global_host 0, // cuda_device 0, // cuda_constant 0, // cuda_shared Index: clang/lib/CodeGen/CodeGenModule.cpp =================================================================== --- clang/lib/CodeGen/CodeGenModule.cpp +++ clang/lib/CodeGen/CodeGenModule.cpp @@ -1329,10 +1329,18 @@ // (basically all single AS CPUs). static unsigned ArgInfoAddressSpace(LangAS AS) { switch (AS) { - case LangAS::opencl_global: return 1; - case LangAS::opencl_constant: return 2; - case LangAS::opencl_local: return 3; - case LangAS::opencl_generic: return 4; // Not in SPIR 2.0 specs. + case LangAS::opencl_global: + return 1; + case LangAS::opencl_constant: + return 2; + case LangAS::opencl_local: + return 3; + case LangAS::opencl_generic: + return 4; // Not in SPIR 2.0 specs. + case LangAS::opencl_global_device: + return 11; + case LangAS::opencl_global_host: + return 12; default: return 0; // Assume private. } @@ -3794,6 +3802,8 @@ if (LangOpts.OpenCL) { AddrSpace = D ? D->getType().getAddressSpace() : LangAS::opencl_global; assert(AddrSpace == LangAS::opencl_global || + AddrSpace == LangAS::opencl_global_device || + AddrSpace == LangAS::opencl_global_host || AddrSpace == LangAS::opencl_constant || AddrSpace == LangAS::opencl_local || AddrSpace >= LangAS::FirstTargetAddressSpace); Index: clang/lib/Sema/SemaType.cpp =================================================================== --- clang/lib/Sema/SemaType.cpp +++ clang/lib/Sema/SemaType.cpp @@ -7892,6 +7892,8 @@ return attrKind == ParsedAttr::AT_AddressSpace || attrKind == ParsedAttr::AT_OpenCLPrivateAddressSpace || attrKind == ParsedAttr::AT_OpenCLGlobalAddressSpace || + attrKind == ParsedAttr::AT_OpenCLGlobalDeviceAddressSpace || + attrKind == ParsedAttr::AT_OpenCLGlobalHostAddressSpace || attrKind == ParsedAttr::AT_OpenCLLocalAddressSpace || attrKind == ParsedAttr::AT_OpenCLConstantAddressSpace || attrKind == ParsedAttr::AT_OpenCLGenericAddressSpace; @@ -7972,6 +7974,8 @@ break; case ParsedAttr::AT_OpenCLPrivateAddressSpace: case ParsedAttr::AT_OpenCLGlobalAddressSpace: + case ParsedAttr::AT_OpenCLGlobalDeviceAddressSpace: + case ParsedAttr::AT_OpenCLGlobalHostAddressSpace: case ParsedAttr::AT_OpenCLLocalAddressSpace: case ParsedAttr::AT_OpenCLConstantAddressSpace: case ParsedAttr::AT_OpenCLGenericAddressSpace: Index: clang/test/AST/language_address_space_attribute.cpp =================================================================== --- clang/test/AST/language_address_space_attribute.cpp +++ clang/test/AST/language_address_space_attribute.cpp @@ -17,6 +17,18 @@ // CHECK: VarDecl {{.*}} z_global '__global int *' [[clang::opencl_global]] int *z_global; + // CHECK: VarDecl {{.*}} x_global_device '__global_device int *' + __attribute__((opencl_global_device)) int *x_global_device; + + // CHECK: VarDecl {{.*}} z_global_device '__global_device int *' + [[clang::opencl_global_device]] int *z_global_device; + + // CHECK: VarDecl {{.*}} x_global_host '__global_host int *' + __attribute__((opencl_global_host)) int *x_global_host; + + // CHECK: VarDecl {{.*}} z_global_host '__global_host int *' + [[clang::opencl_global_host]] int *z_global_host; + // CHECK: VarDecl {{.*}} x_local '__local int *' __attribute__((opencl_local)) int *x_local; Index: clang/test/CodeGenCXX/mangle-address-space.cpp =================================================================== --- clang/test/CodeGenCXX/mangle-address-space.cpp +++ clang/test/CodeGenCXX/mangle-address-space.cpp @@ -43,6 +43,10 @@ struct ocl_OpaqueType; typedef ocl_OpaqueType __global * ocl_OpaqueTypePtr; +typedef ocl_OpaqueType __attribute__((opencl_global_host)) * ocl_OpaqueTypePtrH; +typedef ocl_OpaqueType + __attribute__((opencl_global_device)) * + ocl_OpaqueTypePtrD; // CHECKOCL-LABEL: define {{.*}}void @_Z6ocl_f0PU8CLglobal14ocl_OpaqueType // WINOCL-LABEL: define {{.*}}void @"?ocl_f0@@YAXPEAU?$_ASCLglobal@$$CAUocl_OpaqueType@@@__clang@@@Z" @@ -61,4 +65,12 @@ // CHECKOCL-LABEL: define {{.*}}float* @_Z6ocl_f2PU9CLgenericKc // 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_f3PU6CLHost14ocl_OpaqueType +// WINOCL-LABEL: define {{.*}}void @"?ocl_f3@@YAXPEAU?$_ASCLHost@$$CAUocl_OpaqueType@@@__clang@@@Z" +void ocl_f3(ocl_OpaqueTypePtrH) {} + +// 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 Index: clang/test/CodeGenOpenCL/address-spaces-conversions.cl =================================================================== --- clang/test/CodeGenOpenCL/address-spaces-conversions.cl +++ clang/test/CodeGenOpenCL/address-spaces-conversions.cl @@ -6,7 +6,9 @@ // pointers to different address spaces // CHECK: define void @test -void test(global int *arg_glob, generic int *arg_gen) { +void test(global int *arg_glob, generic int *arg_gen, + __attribute__((opencl_global_device)) int *arg_device, + __attribute__((opencl_global_host)) int *arg_host) { int var_priv; arg_gen = arg_glob; // implicit cast global -> generic // CHECK: %{{[0-9]+}} = addrspacecast i32 addrspace(1)* %{{[0-9]+}} to i32 addrspace(4)* @@ -39,6 +41,14 @@ // CHECK-NOT: bitcast // CHECK-NOFAKE: bitcast // CHECK-NOFAKE-NOT: addrspacecast + + arg_glob = (global int *)arg_device; // explicit cast + // CHECK: %{{[0-9]+}} = addrspacecast i32 addrspace(11)* %{{[0-9]+}} to i32 addrspace(1)* + // CHECK-NOFAKE-NOT: addrspacecast + + arg_glob = (global int *)arg_host; // explicit cast + // CHECK: %{{[0-9]+}} = addrspacecast i32 addrspace(12)* %{{[0-9]+}} to i32 addrspace(1)* + // CHECK-NOFAKE-NOT: addrspacecast } // Test ternary operator. Index: clang/test/SemaTemplate/address_space-dependent.cpp =================================================================== --- clang/test/SemaTemplate/address_space-dependent.cpp +++ clang/test/SemaTemplate/address_space-dependent.cpp @@ -43,7 +43,7 @@ template void tooBig() { - __attribute__((address_space(I))) int *bounds; // expected-error {{address space is larger than the maximum supported (8388595)}} + __attribute__((address_space(I))) int *bounds; // expected-error {{address space is larger than the maximum supported (8388593)}} } template