This is an archive of the discontinued LLVM Phabricator instance.

Differential D90766

[OpenCL] Support vec_step in C++ for OpenCL mode
ClosedPublic

Authored by svenvh on Nov 4 2020, 7:52 AM.

Details

Reviewers
Anastasia
Commits
rG8ac9bcc746b9: [OpenCL] Support vec_step in C++ for OpenCL mode
Summary

For compatibility with OpenCL C, enable the vec_step builtin in C++ for OpenCL mode.

Diff Detail

Event Timeline

svenvh created this revision.Nov 4 2020, 7:52 AM
Herald added subscribers: dexonsmith, yaxunl. · View Herald TranscriptNov 4 2020, 7:52 AM
svenvh requested review of this revision.Nov 4 2020, 7:52 AM
Anastasia accepted this revision.Nov 4 2020, 8:02 AM

LGTM! Good spot!

This revision is now accepted and ready to land.Nov 4 2020, 8:02 AM
svenvh set the repository for this revision to rG LLVM Github Monorepo.Nov 4 2020, 8:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 4 2020, 8:23 AM
Closed by commit rG8ac9bcc746b9: [OpenCL] Support vec_step in C++ for OpenCL mode (authored by svenvh). · Explain WhyNov 5 2020, 4:03 AM
This revision was automatically updated to reflect the committed changes.
svenvh added a commit: rG8ac9bcc746b9: [OpenCL] Support vec_step in C++ for OpenCL mode.

Revision Contents

PathSize
clang/
include/
clang/
Basic/
2 lines
test/
CodeGenOpenCLCXX/
10 lines

Diff 303078

clang/include/clang/Basic/TokenKinds.def

Show First 20 Lines • Show All 580 Lines • ▼ Show 20 Lines
KEYWORD(__read_only , KEYOPENCLC | KEYOPENCLCXX) KEYWORD(__read_only , KEYOPENCLC | KEYOPENCLCXX)
KEYWORD(__write_only , KEYOPENCLC | KEYOPENCLCXX) KEYWORD(__write_only , KEYOPENCLC | KEYOPENCLCXX)
KEYWORD(__read_write , KEYOPENCLC | KEYOPENCLCXX) KEYWORD(__read_write , KEYOPENCLC | KEYOPENCLCXX)
ALIAS("read_only", __read_only , KEYOPENCLC | KEYOPENCLCXX) ALIAS("read_only", __read_only , KEYOPENCLC | KEYOPENCLCXX)
ALIAS("write_only", __write_only , KEYOPENCLC | KEYOPENCLCXX) ALIAS("write_only", __write_only , KEYOPENCLC | KEYOPENCLCXX)
ALIAS("read_write", __read_write , KEYOPENCLC | KEYOPENCLCXX) ALIAS("read_write", __read_write , KEYOPENCLC | KEYOPENCLCXX)
// OpenCL builtins // OpenCL builtins
KEYWORD(__builtin_astype , KEYOPENCLC | KEYOPENCLCXX) KEYWORD(__builtin_astype , KEYOPENCLC | KEYOPENCLCXX)
UNARY_EXPR_OR_TYPE_TRAIT(vec_step, VecStep, KEYOPENCLC | KEYALTIVEC | KEYZVECTOR) UNARY_EXPR_OR_TYPE_TRAIT(vec_step, VecStep, KEYOPENCLC | KEYOPENCLCXX | KEYALTIVEC | KEYZVECTOR)
#define GENERIC_IMAGE_TYPE(ImgType, Id) KEYWORD(ImgType##_t, KEYOPENCLC | KEYOPENCLCXX) #define GENERIC_IMAGE_TYPE(ImgType, Id) KEYWORD(ImgType##_t, KEYOPENCLC | KEYOPENCLCXX)
#include "clang/Basic/OpenCLImageTypes.def" #include "clang/Basic/OpenCLImageTypes.def"
KEYWORD(pipe , KEYOPENCLC | KEYOPENCLCXX) KEYWORD(pipe , KEYOPENCLC | KEYOPENCLCXX)
// C++ for OpenCL s2.3.1: addrspace_cast operator // C++ for OpenCL s2.3.1: addrspace_cast operator
KEYWORD(addrspace_cast , KEYOPENCLCXX) KEYWORD(addrspace_cast , KEYOPENCLCXX)
// OpenMP Type Traits // OpenMP Type Traits
UNARY_EXPR_OR_TYPE_TRAIT(__builtin_omp_required_simd_align, OpenMPRequiredSimdAlign, KEYALL) UNARY_EXPR_OR_TYPE_TRAIT(__builtin_omp_required_simd_align, OpenMPRequiredSimdAlign, KEYALL)
▲ Show 20 Lines • Show All 309 Lines • Show Last 20 Lines

clang/test/CodeGenOpenCLCXX/constexpr.cl

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
constexpr int2 addOne(int2 x) { constexpr int2 addOne(int2 x) {
return (int2)(x.x + 1, x.y + 1); return (int2)(x.x + 1, x.y + 1);
} }
const int2 fromConstexprFunc = addOne(int2(2)); const int2 fromConstexprFunc = addOne(int2(2));
kernel void vecEval2(global int2 *x) { kernel void vecEval2(global int2 *x) {
*x = fromConstexprFunc; *x = fromConstexprFunc;
} }
// Test evaluation of vec_step
// CHECK-LABEL: define spir_kernel void @vec_step_test
// CHECK: store i32 6
constexpr int vsize1 = vec_step(fromConstexprFunc);
constexpr int vsize2 = vec_step(int4);
kernel void vec_step_test(global int *x) {
*x = vsize1 + vsize2;
}