This is an archive of the discontinued LLVM Phabricator instance.

Differential D106254

[OpenCL][NFC] Refactors conditional versioning
ClosedPublic

Authored by Topotuna on Jul 19 2021, 2:13 AM.

Details

Reviewers
Anastasia
Commits
rGb510e0127da3: [OpenCL][NFC] Refactors lang version check in test.
Summary

Removes run line declaration -DCL20 and substitutes it with
condition on macro CL_VERSION_2_0.

Diff Detail

Event Timeline

Topotuna created this revision.Jul 19 2021, 2:13 AM
Herald added subscribers: ldrumm, yaxunl. · View Herald TranscriptJul 19 2021, 2:13 AM
Topotuna requested review of this revision.Jul 19 2021, 2:13 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2021, 2:13 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B114794: Diff 359700.Jul 19 2021, 2:14 AM
Topotuna mentioned this in D105987: [C++4OpenCL] NULL redefined as nullptr.Jul 19 2021, 2:21 AM
Topotuna added a child revision: D105987: [C++4OpenCL] NULL redefined as nullptr.Jul 19 2021, 2:24 AM
Anastasia accepted this revision.Jul 19 2021, 2:47 PM

LGTM! Thanks!

This revision is now accepted and ready to land.Jul 19 2021, 2:47 PM
Topotuna added a parent revision: D105988: [OpenCL] NULL introduced prior to v2.0.Jul 20 2021, 1:01 AM
This revision was landed with ongoing or failed builds.Jul 22 2021, 8:48 AM
Closed by commit rGb510e0127da3: [OpenCL][NFC] Refactors lang version check in test. (authored by Anastasia). · Explain Why
This revision was automatically updated to reflect the committed changes.
Anastasia added a commit: rGb510e0127da3: [OpenCL][NFC] Refactors lang version check in test..

Revision Contents

PathSize
clang/
test/
SemaOpenCL/
4 lines

Diff 360843

clang/test/SemaOpenCL/null_literal.cl

// RUN: %clang_cc1 -verify %s // RUN: %clang_cc1 -verify %s
// RUN: %clang_cc1 -cl-std=CL2.0 -DCL20 -verify %s // RUN: %clang_cc1 -cl-std=CL2.0 -verify %s
#define NULL ((void*)0) #define NULL ((void*)0)
void foo(){ void foo(){
global int* ptr1 = NULL; global int* ptr1 = NULL;
global int* ptr2 = (global void*)0; global int* ptr2 = (global void*)0;
constant int* ptr3 = NULL; constant int* ptr3 = NULL;
constant int* ptr4 = (global void*)0; // expected-error{{initializing '__constant int *__private' with an expression of type '__global void *' changes address space of pointer}} constant int* ptr4 = (global void*)0; // expected-error{{initializing '__constant int *__private' with an expression of type '__global void *' changes address space of pointer}}
#ifdef CL20 #if __OPENCL_C_VERSION__ == CL_VERSION_2_0
// Accept explicitly pointer to generic address space in OpenCL v2.0. // Accept explicitly pointer to generic address space in OpenCL v2.0.
global int* ptr5 = (generic void*)0; global int* ptr5 = (generic void*)0;
#endif #endif
global int* ptr6 = (local void*)0; // expected-error{{initializing '__global int *__private' with an expression of type '__local void *' changes address space of pointer}} global int* ptr6 = (local void*)0; // expected-error{{initializing '__global int *__private' with an expression of type '__local void *' changes address space of pointer}}
bool cmp = ptr1 == NULL; bool cmp = ptr1 == NULL;
cmp = ptr1 == (local void*)0; // expected-error{{comparison between ('__global int *' and '__local void *') which are pointers to non-overlapping address spaces}} cmp = ptr1 == (local void*)0; // expected-error{{comparison between ('__global int *' and '__local void *') which are pointers to non-overlapping address spaces}}
cmp = ptr3 == NULL; cmp = ptr3 == NULL;
} }