This is an archive of the discontinued LLVM Phabricator instance.

Differential D62208

[OpenCL] Enable queue_t and clk_event_t comparisons in C++ mode
ClosedPublic

Authored by svenvh on May 21 2019, 10:07 AM.

Details

Reviewers
Anastasia
Commits
rG50434e8df0a3: Enable queue_t and clk_event_t comparisons in C++ mode
rC361467: Enable queue_t and clk_event_t comparisons in C++ mode
rL361467: Enable queue_t and clk_event_t comparisons in C++ mode
Summary

Support queue_t and clk_event_t comparisons in C++ for OpenCL mode, to
preserve backwards compatibility with OpenCL C.

Diff Detail

Repository
rL LLVM

Event Timeline

svenvh created this revision.May 21 2019, 10:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 21 2019, 10:07 AM
Herald added subscribers: cfe-commits, yaxunl. · View Herald Transcript
Anastasia accepted this revision.May 22 2019, 8:23 AM

LGTM! Thanks!

This revision is now accepted and ready to land.May 22 2019, 8:23 AM
Closed by commit rL361467: Enable queue_t and clk_event_t comparisons in C++ mode (authored by svenvh). · Explain WhyMay 23 2019, 2:17 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptMay 23 2019, 2:17 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
cfe/
trunk/
lib/
Sema/
2 lines
test/
SemaOpenCL/
1 line

Diff 200895

cfe/trunk/lib/Sema/SemaExpr.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 10,802 Lines • ▼ Show 20 Lines if (!IsRelational && RHSIsNull
return computeResultTy(); return computeResultTy();
} }
if (!IsRelational && LHSIsNull if (!IsRelational && LHSIsNull
&& LHSType->isIntegerType() && RHSType->isBlockPointerType()) { && LHSType->isIntegerType() && RHSType->isBlockPointerType()) {
LHS = ImpCastExprToType(LHS.get(), RHSType, CK_NullToPointer); LHS = ImpCastExprToType(LHS.get(), RHSType, CK_NullToPointer);
return computeResultTy(); return computeResultTy();
} }
if (getLangOpts().OpenCLVersion >= 200) { if (getLangOpts().OpenCLVersion >= 200 || getLangOpts().OpenCLCPlusPlus) {
if (LHSType->isClkEventT() && RHSType->isClkEventT()) { if (LHSType->isClkEventT() && RHSType->isClkEventT()) {
return computeResultTy(); return computeResultTy();
} }
if (LHSType->isQueueT() && RHSType->isQueueT()) { if (LHSType->isQueueT() && RHSType->isQueueT()) {
return computeResultTy(); return computeResultTy();
} }
▲ Show 20 Lines • Show All 6,237 Lines • Show Last 20 Lines

cfe/trunk/test/SemaOpenCL/clk_event_t.cl

// 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=c++
// Taken from opencl-c.h // Taken from opencl-c.h
#define CLK_NULL_EVENT (__builtin_astype(((void*)(__SIZE_MAX__)), clk_event_t)) #define CLK_NULL_EVENT (__builtin_astype(((void*)(__SIZE_MAX__)), clk_event_t))
global clk_event_t ce; // expected-error {{the '__global clk_event_t' type cannot be used to declare a program scope variable}} global clk_event_t ce; // expected-error {{the '__global clk_event_t' type cannot be used to declare a program scope variable}}
int clk_event_tests() { int clk_event_tests() {
event_t e; event_t e;
Show All 16 Lines