[PATCH] D96515: [OpenCL] Add builtin declarations by default.

[Anastasia Stulova via Phabricator via cfe-commits]

Anastasia added a comment.

In D96515#2578765 <https://reviews.llvm.org/D96515#2578765>, @thakis wrote:

> In D96515#2578666 <https://reviews.llvm.org/D96515#2578666>, @Anastasia wrote:
>
>> In D96515#2578629 <https://reviews.llvm.org/D96515#2578629>, @thakis wrote:
>>
>>> Looks like this breaks tests: http://45.33.8.238/linux/39988/step_8.txt
>>>
>>> Please take a look, and revert for now if it takes a while to fix.
>>
>> Thanks for pointing this out. I think the following change should fix the issue, but I am still trying to reproduce it locally as it is taking time to build.
>>
>>   diff --git a/clang-tools-extra/test/pp-trace/pp-trace-pragma-opencl.cpp b/clang-tools-extra/test/pp-trace/pp-trace-pragma-opencl.cpp
>>   index 8ba26c3b7396..31f61027994f 100644
>>   --- a/clang-tools-extra/test/pp-trace/pp-trace-pragma-opencl.cpp
>>   +++ b/clang-tools-extra/test/pp-trace/pp-trace-pragma-opencl.cpp
>>   @@ -1,4 +1,4 @@
>>   -// RUN: pp-trace -callbacks '*,-FileChanged,-MacroDefined' %s -- -x cl | FileCheck --strict-whitespace %s
>>   +// RUN: pp-trace -callbacks '*,-FileChanged,-MacroDefined' %s -- -x cl -cl-no-stdinc | FileCheck --strict-whitespace %s
>>    
>>    #pragma OPENCL EXTENSION all : disable
>>    #pragma OPENCL EXTENSION cl_khr_int64_base_atomics : disable
>>
>> FYI, @thakis would you be able to approve the fix? Otherwise, I am also ok to revert it until I figure out how to commit the fix.
>
> The test is already broken, so speculatively landing that and seeing if it helps sounds fine. But let's try to not keep the build broken for hours. (Was afk for a bit, and it looks like it's still broken now that I look again.)

I have just committed the fix after verifying that it indeed makes the test pass: https://github.com/llvm/llvm-project/commit/b71add9777bed67e05206fa1fdb665f3e21a13ab


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D96515/new/

https://reviews.llvm.org/D96515