This is an archive of the discontinued LLVM Phabricator instance.

Differential D108704

[OpenCL] Define OpenCL 3.0 optional core features in C++ for OpenCL 2021
ClosedPublic

Authored by Topotuna on Aug 25 2021, 8:06 AM.

Details

Reviewers
Anastasia
Commits
rGfb321c2ea274: [OpenCL] Define OpenCL 3.0 optional core features in C++ for OpenCL 2021
Summary

Modifies OpenCL 3.0 optional core feature macro definitions so that
they are set analogously in C++ for OpenCL 2021.

This change aims to achieve compatibility between C++ for OpenCL
2021 and OpenCL 3.0.

Diff Detail

Event Timeline

Topotuna created this revision.Aug 25 2021, 8:06 AM
Herald added subscribers: ldrumm, yaxunl. · View Herald TranscriptAug 25 2021, 8:06 AM
Topotuna requested review of this revision.Aug 25 2021, 8:06 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 25 2021, 8:06 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B121165: Diff 368639.Aug 25 2021, 8:51 AM
Anastasia accepted this revision.Aug 26 2021, 10:08 AM

LGTM! Thanks

This revision is now accepted and ready to land.Aug 26 2021, 10:08 AM
This revision was landed with ongoing or failed builds.Sep 1 2021, 2:16 AM
Closed by commit rGfb321c2ea274: [OpenCL] Define OpenCL 3.0 optional core features in C++ for OpenCL 2021 (authored by Topotuna). · Explain Why
This revision was automatically updated to reflect the committed changes.
Topotuna added a commit: rGfb321c2ea274: [OpenCL] Define OpenCL 3.0 optional core features in C++ for OpenCL 2021.

Revision Contents

PathSize
clang/
lib/
Headers/
6 lines
test/
Headers/
6 lines
SemaOpenCL/
10 lines

Diff 369887

clang/lib/Headers/opencl-c-base.h

Show All 24 Lines
#define cl_khr_integer_dot_product 1 #define cl_khr_integer_dot_product 1
#define __opencl_c_integer_dot_product_input_4x8bit 1 #define __opencl_c_integer_dot_product_input_4x8bit 1
#define __opencl_c_integer_dot_product_input_4x8bit_packed 1 #define __opencl_c_integer_dot_product_input_4x8bit_packed 1
#endif // defined(__SPIR__) #endif // defined(__SPIR__)
#endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200) #endif // (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
// Define feature macros for OpenCL C 2.0 // Define feature macros for OpenCL C 2.0
#if (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200) #if (__OPENCL_CPP_VERSION__ == 100 || __OPENCL_C_VERSION__ == 200)
#define __opencl_c_pipes 1 #define __opencl_c_pipes 1
#define __opencl_c_generic_address_space 1 #define __opencl_c_generic_address_space 1
#define __opencl_c_work_group_collective_functions 1 #define __opencl_c_work_group_collective_functions 1
#define __opencl_c_atomic_order_acq_rel 1 #define __opencl_c_atomic_order_acq_rel 1
#define __opencl_c_atomic_order_seq_cst 1 #define __opencl_c_atomic_order_seq_cst 1
#define __opencl_c_atomic_scope_device 1 #define __opencl_c_atomic_scope_device 1
#define __opencl_c_atomic_scope_all_devices 1 #define __opencl_c_atomic_scope_all_devices 1
#define __opencl_c_device_enqueue 1 #define __opencl_c_device_enqueue 1
#define __opencl_c_read_write_images 1 #define __opencl_c_read_write_images 1
#define __opencl_c_program_scope_global_variables 1 #define __opencl_c_program_scope_global_variables 1
#define __opencl_c_images 1 #define __opencl_c_images 1
#endif #endif
// Define header-only feature macros for OpenCL C 3.0. // Define header-only feature macros for OpenCL C 3.0.
#if (__OPENCL_C_VERSION__ == 300) #if (__OPENCL_CPP_VERSION__ == 202100 || __OPENCL_C_VERSION__ == 300)
// For the SPIR target all features are supported. // For the SPIR target all features are supported.
#if defined(__SPIR__) #if defined(__SPIR__)
#define __opencl_c_atomic_scope_all_devices 1 #define __opencl_c_atomic_scope_all_devices 1
#endif // defined(__SPIR__) #endif // defined(__SPIR__)
#endif // (__OPENCL_C_VERSION__ == 300) #endif // (__OPENCL_CPP_VERSION__ == 202100 || __OPENCL_C_VERSION__ == 300)
// built-in scalar data types: // built-in scalar data types:
/** /**
* An unsigned 8-bit integer. * An unsigned 8-bit integer.
*/ */
typedef unsigned char uchar; typedef unsigned char uchar;
▲ Show 20 Lines • Show All 695 Lines • Show Last 20 Lines

clang/test/Headers/opencl-c-header.cl

Show First 20 Lines • Show All 169 Lines • ▼ Show 20 Lines
#endif #endif
#ifdef __opencl_c_integer_dot_product_input_4x8bit_packed #ifdef __opencl_c_integer_dot_product_input_4x8bit_packed
#error "Incorrect __opencl_c_integer_dot_product_input_4x8bit_packed define" #error "Incorrect __opencl_c_integer_dot_product_input_4x8bit_packed define"
#endif #endif
#endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200) #endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ >= 200)
// OpenCL C features. // OpenCL C features.
#if (__OPENCL_C_VERSION__ == 300) #if (__OPENCL_CPP_VERSION__ == 202100 || __OPENCL_C_VERSION__ == 300)
#if __opencl_c_atomic_scope_all_devices != 1 #if __opencl_c_atomic_scope_all_devices != 1
#error "Incorrectly defined feature macro __opencl_c_atomic_scope_all_devices" #error "Incorrectly defined feature macro __opencl_c_atomic_scope_all_devices"
#endif #endif
#elif (defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200) #elif (__OPENCL_CPP_VERSION__ == 100 || __OPENCL_C_VERSION__ == 200)
#ifndef __opencl_c_pipes #ifndef __opencl_c_pipes
#error "Feature macro __opencl_c_pipes should be defined" #error "Feature macro __opencl_c_pipes should be defined"
#endif #endif
#ifndef __opencl_c_generic_address_space #ifndef __opencl_c_generic_address_space
#error "Feature macro __opencl_c_generic_address_space should be defined" #error "Feature macro __opencl_c_generic_address_space should be defined"
#endif #endif
#ifndef __opencl_c_work_group_collective_functions #ifndef __opencl_c_work_group_collective_functions
▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Lines
#endif #endif
#ifdef __opencl_c_fp64 #ifdef __opencl_c_fp64
#error "Incorrect feature macro __opencl_c_fp64 define" #error "Incorrect feature macro __opencl_c_fp64 define"
#endif #endif
#ifdef __opencl_c_subgroups #ifdef __opencl_c_subgroups
#error "Incorrect feature macro __opencl_c_subgroups define" #error "Incorrect feature macro __opencl_c_subgroups define"
#endif #endif
#endif //(defined(__OPENCL_CPP_VERSION__) || __OPENCL_C_VERSION__ == 200) #endif // (__OPENCL_CPP_VERSION__ == 202100 || __OPENCL_C_VERSION__ == 300)
#endif // defined(__SPIR__) #endif // defined(__SPIR__)

clang/test/SemaOpenCL/features.cl

// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=-all \ // RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=-all \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=+all \ // RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=+all \
// RUN: | FileCheck -match-full-lines %s --check-prefix=FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=FEATURES
// RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 \ // RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=+all \ // RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -cl-ext=+all \
// RUN: | FileCheck -match-full-lines %s --check-prefix=FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=FEATURES
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=clc++2021 -cl-ext=-all \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=clc++2021 -cl-ext=+all \
// RUN: | FileCheck -match-full-lines %s --check-prefix=FEATURES
// RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=clc++2021 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple r600-unknown-unknown %s -E -dM -o - -x cl -cl-std=clc++2021 -cl-ext=+all \
// RUN: | FileCheck -match-full-lines %s --check-prefix=FEATURES
// For OpenCL C 2.0 feature macros are defined only in header, so test that earlier OpenCL // For OpenCL C 2.0 feature macros are defined only in header, so test that earlier OpenCL
// versions don't define feature macros accidentally and CL2.0 don't define them without header // versions don't define feature macros accidentally and CL2.0 don't define them without header
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL1.1 \ // RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL1.1 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL1.2 \ // RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL1.2 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL2.0 \ // RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL2.0 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CLC++ \ // RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=clc++1.0 \
// RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES // RUN: | FileCheck -match-full-lines %s --check-prefix=NO-FEATURES
// Note that __opencl_c_int64 is always defined assuming // Note that __opencl_c_int64 is always defined assuming
// always compiling for FULL OpenCL profile // always compiling for FULL OpenCL profile
// FEATURES: #define __opencl_c_3d_image_writes 1 // FEATURES: #define __opencl_c_3d_image_writes 1
// FEATURES: #define __opencl_c_atomic_order_acq_rel 1 // FEATURES: #define __opencl_c_atomic_order_acq_rel 1
// FEATURES: #define __opencl_c_atomic_order_seq_cst 1 // FEATURES: #define __opencl_c_atomic_order_seq_cst 1
Show All 22 Lines