mirror of https://github.com/microsoft/clang.git
[OpenCL] Forbid size dependent types used as kernel arguments
Summary: Size_t, intptr_t, uintptr_t and ptrdiff_t cannot be used as kernel arguments, according to OpenCL Specification s6.9k: The size in bytes of these types are implementation-defined and in addition can also be different for the OpenCL device and the host processor making it difficult to allocate buffer objects to be passed as arguments to a kernel declared as pointer to these types. Patch by: Andrew Savonichev Reviewers: Anastasia, yaxunl Subscribers: yaxunl, Anastasia, cfe-commits Differential Revision: https://reviews.llvm.org/D49725 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@338432 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
e9901bde15
commit
53fd6771b4
|
@ -8049,6 +8049,29 @@ enum OpenCLParamType {
|
||||||
RecordKernelParam
|
RecordKernelParam
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static bool isOpenCLSizeDependentType(ASTContext &C, QualType Ty) {
|
||||||
|
// Size dependent types are just typedefs to normal integer types
|
||||||
|
// (e.g. unsigned long), so we cannot distinguish them from other typedefs to
|
||||||
|
// integers other than by their names.
|
||||||
|
StringRef SizeTypeNames[] = {"size_t", "intptr_t", "uintptr_t", "ptrdiff_t"};
|
||||||
|
|
||||||
|
// Remove typedefs one by one until we reach a typedef
|
||||||
|
// for a size dependent type.
|
||||||
|
QualType DesugaredTy = Ty;
|
||||||
|
do {
|
||||||
|
ArrayRef<StringRef> Names(SizeTypeNames);
|
||||||
|
auto Match =
|
||||||
|
std::find(Names.begin(), Names.end(), DesugaredTy.getAsString());
|
||||||
|
if (Names.end() != Match)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
Ty = DesugaredTy;
|
||||||
|
DesugaredTy = Ty.getSingleStepDesugaredType(C);
|
||||||
|
} while (DesugaredTy != Ty);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static OpenCLParamType getOpenCLKernelParameterType(Sema &S, QualType PT) {
|
static OpenCLParamType getOpenCLKernelParameterType(Sema &S, QualType PT) {
|
||||||
if (PT->isPointerType()) {
|
if (PT->isPointerType()) {
|
||||||
QualType PointeeType = PT->getPointeeType();
|
QualType PointeeType = PT->getPointeeType();
|
||||||
|
@ -8061,8 +8084,13 @@ static OpenCLParamType getOpenCLKernelParameterType(Sema &S, QualType PT) {
|
||||||
return PtrKernelParam;
|
return PtrKernelParam;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Forbid the other integer types (size_t, ptrdiff_t...) when they can
|
// OpenCL v1.2 s6.9.k:
|
||||||
// be used as builtin types.
|
// Arguments to kernel functions in a program cannot be declared with the
|
||||||
|
// built-in scalar types bool, half, size_t, ptrdiff_t, intptr_t, and
|
||||||
|
// uintptr_t or a struct and/or union that contain fields declared to be one
|
||||||
|
// of these built-in scalar types.
|
||||||
|
if (isOpenCLSizeDependentType(S.getASTContext(), PT))
|
||||||
|
return InvalidKernelParam;
|
||||||
|
|
||||||
if (PT->isImageType())
|
if (PT->isImageType())
|
||||||
return PtrKernelParam;
|
return PtrKernelParam;
|
||||||
|
@ -8133,8 +8161,20 @@ static void checkIsValidOpenCLKernelParameter(
|
||||||
// of event_t type.
|
// of event_t type.
|
||||||
// Do not diagnose half type since it is diagnosed as invalid argument
|
// Do not diagnose half type since it is diagnosed as invalid argument
|
||||||
// type for any function elsewhere.
|
// type for any function elsewhere.
|
||||||
if (!PT->isHalfType())
|
if (!PT->isHalfType()) {
|
||||||
S.Diag(Param->getLocation(), diag::err_bad_kernel_param_type) << PT;
|
S.Diag(Param->getLocation(), diag::err_bad_kernel_param_type) << PT;
|
||||||
|
|
||||||
|
// Explain what typedefs are involved.
|
||||||
|
const TypedefType *Typedef = nullptr;
|
||||||
|
while ((Typedef = PT->getAs<TypedefType>())) {
|
||||||
|
SourceLocation Loc = Typedef->getDecl()->getLocation();
|
||||||
|
// SourceLocation may be invalid for a built-in type.
|
||||||
|
if (Loc.isValid())
|
||||||
|
S.Diag(Loc, diag::note_entity_declared_at) << PT;
|
||||||
|
PT = Typedef->desugar();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
D.setInvalidType();
|
D.setInvalidType();
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,35 @@ kernel void half_arg(half x) { } // expected-error{{declaring function parameter
|
||||||
// bool, half, size_t, ptrdiff_t, intptr_t, and uintptr_t
|
// bool, half, size_t, ptrdiff_t, intptr_t, and uintptr_t
|
||||||
// or a struct / union with any of these types in them
|
// or a struct / union with any of these types in them
|
||||||
|
|
||||||
// TODO: Ban int types, size_t, ptrdiff_t ...
|
typedef __SIZE_TYPE__ size_t; // expected-note{{'size_t' (aka 'unsigned int') declared here}}
|
||||||
|
// expected-note@-1{{'size_t' (aka 'unsigned int') declared here}}
|
||||||
|
typedef __PTRDIFF_TYPE__ ptrdiff_t; // expected-note{{'ptrdiff_t' (aka 'int') declared here}}
|
||||||
|
typedef __INTPTR_TYPE__ intptr_t; // expected-note{{'intptr_t' (aka 'int') declared here}}
|
||||||
|
typedef __UINTPTR_TYPE__ uintptr_t; // expected-note{{'uintptr_t' (aka 'unsigned int') declared here}}
|
||||||
|
|
||||||
|
kernel void size_t_arg(size_t x) {} // expected-error{{'size_t' (aka 'unsigned int') cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
kernel void ptrdiff_t_arg(ptrdiff_t x) {} // expected-error{{'ptrdiff_t' (aka 'int') cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
kernel void intptr_t_arg(intptr_t x) {} // expected-error{{'intptr_t' (aka 'int') cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
kernel void uintptr_t_arg(uintptr_t x) {} // expected-error{{'uintptr_t' (aka 'unsigned int') cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
typedef size_t size_ty;
|
||||||
|
struct SizeTStruct { // expected-note{{within field of type 'SizeTStruct' declared here}}
|
||||||
|
size_ty s; // expected-note{{field of illegal type 'size_ty' (aka 'unsigned int') declared here}}
|
||||||
|
};
|
||||||
|
kernel void size_t_struct_arg(struct SizeTStruct x) {} // expected-error{{'struct SizeTStruct' cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
union SizeTUnion { // expected-note{{within field of type 'SizeTUnion' declared here}}
|
||||||
|
size_t s; // expected-note{{field of illegal type 'size_t' (aka 'unsigned int') declared here}}
|
||||||
|
float f;
|
||||||
|
};
|
||||||
|
kernel void size_t_union_arg(union SizeTUnion x) {} // expected-error{{'union SizeTUnion' cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
typedef size_t s_ty; // expected-note{{'s_ty' (aka 'unsigned int') declared here}}
|
||||||
|
typedef s_ty ss_ty; // expected-note{{'ss_ty' (aka 'unsigned int') declared here}}
|
||||||
|
kernel void typedef_to_size_t(ss_ty s) {} // expected-error{{'ss_ty' (aka 'unsigned int') cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
kernel void bool_arg(bool x) { } // expected-error{{'bool' cannot be used as the type of a kernel parameter}}
|
kernel void bool_arg(bool x) { } // expected-error{{'bool' cannot be used as the type of a kernel parameter}}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue