This is an archive of the discontinued LLVM Phabricator instance.

Differential D109370

[OpenCL] Enables .rgba vector extension in C++ for OpenCL 2021
ClosedPublic

Authored by Topotuna on Sep 7 2021, 8:56 AM.

Details

Reviewers
Anastasia
Commits
rG09dc454b00b8: [OpenCL] Enables .rgba vector extension in C++ for OpenCL 2021
Summary

.rgba vector extension setting in C++ for OpenCL 2021 is now
performed analogously to OpenCL C 3.0. Test case added.

Diff Detail

Event Timeline

Topotuna created this revision.Sep 7 2021, 8:56 AM
Herald added subscribers: ldrumm, yaxunl. · View Herald TranscriptSep 7 2021, 8:56 AM
Topotuna requested review of this revision.Sep 7 2021, 8:56 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 7 2021, 8:56 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B122886: Diff 371098.Sep 7 2021, 9:39 AM
Anastasia accepted this revision.Sep 9 2021, 3:42 AM

LGTM! Thanks

This revision is now accepted and ready to land.Sep 9 2021, 3:42 AM
Closed by commit rG09dc454b00b8: [OpenCL] Enables .rgba vector extension in C++ for OpenCL 2021 (authored by Topotuna). · Explain WhySep 14 2021, 5:06 AM
This revision was automatically updated to reflect the committed changes.
Topotuna added a commit: rG09dc454b00b8: [OpenCL] Enables .rgba vector extension in C++ for OpenCL 2021.

Revision Contents

PathSize
clang/
lib/
Sema/
3 lines
test/
SemaOpenCL/
5 lines

Diff 372458

clang/lib/Sema/SemaExprMember.cpp

Show First 20 Lines • Show All 334 Lines • ▼ Show 20 Lines do {
break; break;
if (HasIndex[Idx]) HasRepeated = true; if (HasIndex[Idx]) HasRepeated = true;
HasIndex[Idx] = true; HasIndex[Idx] = true;
compStr++; compStr++;
} while (*compStr && (Idx = vecType->getPointAccessorIdx(*compStr)) != -1); } while (*compStr && (Idx = vecType->getPointAccessorIdx(*compStr)) != -1);
// Emit a warning if an rgba selector is used earlier than OpenCL C 3.0. // Emit a warning if an rgba selector is used earlier than OpenCL C 3.0.
if (HasRGBA || (*compStr && IsRGBA(*compStr))) { if (HasRGBA || (*compStr && IsRGBA(*compStr))) {
if (S.getLangOpts().OpenCL && S.getLangOpts().OpenCLVersion < 300) { if (S.getLangOpts().OpenCL &&
S.getLangOpts().getOpenCLCompatibleVersion() < 300) {
const char *DiagBegin = HasRGBA ? CompName->getNameStart() : compStr; const char *DiagBegin = HasRGBA ? CompName->getNameStart() : compStr;
S.Diag(OpLoc, diag::ext_opencl_ext_vector_type_rgba_selector) S.Diag(OpLoc, diag::ext_opencl_ext_vector_type_rgba_selector)
<< StringRef(DiagBegin, 1) << SourceRange(CompLoc); << StringRef(DiagBegin, 1) << SourceRange(CompLoc);
} }
} }
} else { } else {
if (HexSwizzle) compStr++; if (HexSwizzle) compStr++;
while ((Idx = vecType->getNumericAccessorIdx(*compStr)) != -1) { while ((Idx = vecType->getNumericAccessorIdx(*compStr)) != -1) {
▲ Show 20 Lines • Show All 1,528 Lines • Show Last 20 Lines

clang/test/SemaOpenCL/ext_vectors.cl

// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL1.1 // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL1.1
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0 // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL2.0
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL3.0 // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL3.0
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++1.0 // RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++1.0
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++2021
typedef float float4 __attribute__((ext_vector_type(4))); typedef float float4 __attribute__((ext_vector_type(4)));
void test_ext_vector_accessors(float4 V) { void test_ext_vector_accessors(float4 V) {
V = V.wzyx; V = V.wzyx;
V = V.abgr; V = V.abgr;
#if (__OPENCL_C_VERSION__ < 300) #if ((defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ < 300) || (defined(__OPENCL_CPP_VERSION__) && __OPENCL_CPP_VERSION__ < 202100))
// expected-warning@-2 {{vector component name 'a' is a feature from OpenCL version 3.0 onwards}} // expected-warning@-2 {{vector component name 'a' is a feature from OpenCL version 3.0 onwards}}
#endif #endif
V = V.xyzr; V = V.xyzr;
// expected-error@-1 {{illegal vector component name 'r'}} // expected-error@-1 {{illegal vector component name 'r'}}
#if (__OPENCL_C_VERSION__ < 300) #if ((defined(__OPENCL_C_VERSION__) && __OPENCL_C_VERSION__ < 300) || (defined(__OPENCL_CPP_VERSION__) && __OPENCL_CPP_VERSION__ < 202100))
// expected-warning@-3 {{vector component name 'r' is a feature from OpenCL version 3.0 onwards}} // expected-warning@-3 {{vector component name 'r' is a feature from OpenCL version 3.0 onwards}}
#endif #endif
} }