From a60b8f468119065f8a6cb4a16598263cb00de0b5 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Mon, 16 Jan 2023 11:32:12 +0000 Subject: [PATCH] [OpenCL] Allow undefining header-only features `opencl-c-base.h` always defines 5 particular feature macros for SPIR-V, making it impossible to disable those features. To allow disabling any of those features, let the header recognize `__undef_` macros. The user can then pass the `-D__undef_` flag on the command line to disable a specific feature. The __undef macro could potentially also be set from `-cl-ext=-feature`, but for now only change the header and only provide __undef macros for the 5 features that are always enabled in `opencl-c-base.h`. Differential Revision: https://reviews.llvm.org/D141297 diff --git a/clang/lib/Headers/opencl-c-base.h b/clang/lib/Headers/opencl-c-base.h index fad2f9c0272b..84a2d834aa3c 100644 --- a/clang/lib/Headers/opencl-c-base.h +++ b/clang/lib/Headers/opencl-c-base.h @@ -93,6 +93,24 @@ #undef __opencl_c_read_write_images #endif +// Undefine any feature macros that have been explicitly disabled using +// an __undef_ macro. +#ifdef __undef___opencl_c_work_group_collective_functions +#undef __opencl_c_work_group_collective_functions +#endif +#ifdef __undef___opencl_c_atomic_order_seq_cst +#undef __opencl_c_atomic_order_seq_cst +#endif +#ifdef __undef___opencl_c_atomic_scope_device +#undef __opencl_c_atomic_scope_device +#endif +#ifdef __undef___opencl_c_atomic_scope_all_devices +#undef __opencl_c_atomic_scope_all_devices +#endif +#ifdef __undef___opencl_c_read_write_images +#undef __opencl_c_read_write_images +#endif + #endif // (__OPENCL_CPP_VERSION__ == 202100 || __OPENCL_C_VERSION__ == 300) #if !defined(__opencl_c_generic_address_space) diff --git a/clang/test/SemaOpenCL/features.cl b/clang/test/SemaOpenCL/features.cl index 3f59b4ea3b5a..7006fb5d181a 100644 --- a/clang/test/SemaOpenCL/features.cl +++ b/clang/test/SemaOpenCL/features.cl @@ -35,6 +35,15 @@ // RUN: -D__undef___opencl_c_read_write_images=1 \ // RUN: | FileCheck %s --check-prefix=NO-HEADERONLY-FEATURES +// For OpenCL C 3.0, header-only features can be disabled using macros. +// RUN: %clang_cc1 -triple spir-unknown-unknown %s -E -dM -o - -x cl -cl-std=CL3.0 -fdeclare-opencl-builtins -finclude-default-header \ +// RUN: -D__undef___opencl_c_work_group_collective_functions=1 \ +// RUN: -D__undef___opencl_c_atomic_order_seq_cst=1 \ +// RUN: -D__undef___opencl_c_atomic_scope_device=1 \ +// RUN: -D__undef___opencl_c_atomic_scope_all_devices=1 \ +// RUN: -D__undef___opencl_c_read_write_images=1 \ +// RUN: | FileCheck %s --check-prefix=NO-HEADERONLY-FEATURES + // Note that __opencl_c_int64 is always defined assuming // always compiling for FULL OpenCL profile