Commit cc9260a0 authored by Justas Janickas's avatar Justas Janickas
Browse files

[OpenCL] Supports optional generic address space semantics in C++ for OpenCL 2021 

Adds support for a feature macro `__opencl_c_generic_adress_space`
in C++ for OpenCL 2021 enabling a respective optional core feature
from OpenCL 3.0. Testing is only performed in SemaOpenCL because
generic address space functionality is yet to be implemented in
C++ for OpenCL 2021.

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

Differential Revision: https://reviews.llvm.org/D108461
parent 2706b1a6

clang/lib/Basic/TargetInfo.cpp

+4 −3
Original line number Diff line number Diff line
@@ -406,10 +406,11 @@ void TargetInfo::adjust(DiagnosticsEngine &Diags, LangOptions &Opts) { 
    // for OpenCL C 2.0 but with no access to target capabilities. Target

    // should be immutable once created and thus these language options need

    // to be defined only once.

    if (Opts.OpenCLVersion == 300) {

    if (Opts.getOpenCLCompatibleVersion() == 300) {

      const auto &OpenCLFeaturesMap = getSupportedOpenCLOpts();

      Opts.OpenCLGenericAddressSpace = hasFeatureEnabled(

          OpenCLFeaturesMap, "__opencl_c_generic_address_space");

      if (Opts.OpenCLVersion == 300)

        Opts.OpenCLPipes =

            hasFeatureEnabled(OpenCLFeaturesMap, "__opencl_c_pipes");

    }

clang/test/SemaOpenCL/address-spaces-conversions-cl2.0.cl

+6 −3
Original line number Diff line number Diff line 
// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=CL2.0

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=CL2.0

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=CL2.0

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=clc++

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=clc++

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=clc++

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=clc++1.0

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=clc++1.0

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=clc++1.0

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DCONSTANT -cl-std=clc++2021 -cl-ext=+__opencl_c_generic_address_space

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGLOBAL -cl-std=clc++2021 -cl-ext=+__opencl_c_generic_address_space

// RUN: %clang_cc1 %s -ffake-address-space-map -verify -pedantic -fsyntax-only -DGENERIC -cl-std=clc++2021 -cl-ext=+__opencl_c_generic_address_space



/* OpenCLC v2.0 adds a set of restrictions for conversions between pointers to

*  different address spaces, mainly described in Sections 6.5.5 and 6.5.6.

clang/test/SemaOpenCL/address-spaces.cl

+2 −1
Original line number Diff line number Diff line 
// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only

// RUN: %clang_cc1 %s -cl-std=CL2.0 -verify -pedantic -fsyntax-only

// RUN: %clang_cc1 %s -cl-std=CL3.0 -cl-ext=+__opencl_c_generic_address_space -verify -pedantic -fsyntax-only

// RUN: %clang_cc1 %s -cl-std=clc++ -verify -pedantic -fsyntax-only

// RUN: %clang_cc1 %s -cl-std=clc++1.0 -verify -pedantic -fsyntax-only

// RUN: %clang_cc1 %s -cl-std=clc++2021 -cl-ext=+__opencl_c_generic_address_space -verify -pedantic -fsyntax-only



__constant int ci = 1;