libclc: Add -cl-no-stdinc to clang flags on clang >=13

[jvesely]

Summary

cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce ("[OpenCL] Add builtin
declarations by default.")
switched behaviour to include "opencl-c-base.h". We don't want or need
that for libclc so pass the flag to revert to old behaviour.

Fixes build since cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce

[Anastasia]

Btw just out of curiosity are there any reasons for libclc not to use clang implicit headers? They support all OpenCL standards and get a lot of new features and bug fixes regularly.

[jvesely]

In D99794#2671843, @Anastasia wrote:

Btw just out of curiosity are there any reasons for libclc not to use clang implicit headers? They support all OpenCL standards and get a lot of new features and bug fixes regularly.

historic. libclc was ignored by most of the clang opencl work and nobody volunteered to switch it to clang provided headers.
Moreover, it has been stuck in clc 1.1/1.2 so most of the new features don't apply.
The main user is mesa/clover so that one needs to be switched to using clang implicit headers first

LLAsm path still can't use (any) headers so that part of this patch would be needed anyway.

[Anastasia]

In D99794#2672235, @jvesely wrote:

In D99794#2671843, @Anastasia wrote:

Btw just out of curiosity are there any reasons for libclc not to use clang implicit headers? They support all OpenCL standards and get a lot of new features and bug fixes regularly.

historic. libclc was ignored by most of the clang opencl work and nobody volunteered to switch it to clang provided headers.
Moreover, it has been stuck in clc 1.1/1.2 so most of the new features don't apply.
The main user is mesa/clover so that one needs to be switched to using clang implicit headers first

OK, I see. Thanks for the clarification! Btw the functionality of version 1.1. and 1.2 is fairly complete in clang headers. So it should be relatively low risk if you switch to it. If there are any specific adjustments needed for libclc we can surely find a way to accommodate those.

[jvesely]

In D99794#2673632, @Anastasia wrote:

In D99794#2672235, @jvesely wrote:

In D99794#2671843, @Anastasia wrote:

Btw just out of curiosity are there any reasons for libclc not to use clang implicit headers? They support all OpenCL standards and get a lot of new features and bug fixes regularly.

historic. libclc was ignored by most of the clang opencl work and nobody volunteered to switch it to clang provided headers.
Moreover, it has been stuck in clc 1.1/1.2 so most of the new features don't apply.
The main user is mesa/clover so that one needs to be switched to using clang implicit headers first

OK, I see. Thanks for the clarification! Btw the functionality of version 1.1. and 1.2 is fairly complete in clang headers. So it should be relatively low risk if you switch to it. If there are any specific adjustments needed for libclc we can surely find a way to accommodate those.

Agreed. Removing the header duplication is on my todo list. it should help avoid the need for changes like D83473 going forward.
It's not a high priority though. Integration with llvm-project cmake, and fixing convert_* correctness issues are higher on the list.

[jvesely]

ping

[jvesely]

ping, @tstellar any concerns about this one?

[tstellar]

LGTM, I agree it would be nice to use the builtin headers, but let's git this fix in first.

libclc/CMakeLists.txt

 endif()
 
 set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 set( CMAKE_CLC_COMPILER ${LLVM_CLANG} )
 set( CMAKE_CLC_ARCHIVE ${LLVM_LINK} )
 set( CMAKE_LLAsm_PREPROCESSOR ${LLVM_CLANG} )
 set( CMAKE_LLAsm_COMPILER ${LLVM_AS} )
 set( CMAKE_LLAsm_ARCHIVE ${LLVM_LINK} )
-enable_language( CLC LLAsm )
 
 # Construct LLVM version define
 string( REPLACE "." ";" LLVM_VERSION_LIST ${LLVM_VERSION} )
 list( GET LLVM_VERSION_LIST 0 LLVM_MAJOR )
 list( GET LLVM_VERSION_LIST 1 LLVM_MINOR )
 set( LLVM_VERSION_DEFINE "-DHAVE_LLVM=0x${LLVM_MAJOR}0${LLVM_MINOR}" )
 
+
+# LLVM 13 enables standard includes by default
+if( ${LLVM_VERSION} VERSION_GREATER "12.99.99" )
+        set( CMAKE_LLAsm_FLAGS ${CMAKE_LLAsm_FLAGS} -cl-no-stdinc )
+        set( CMAKE_CLC_FLAGS ${CMAKE_CLC_FLAGS} -cl-no-stdinc )
+endif()
+
+enable_language( CLC LLAsm )
+
 # This needs to be set before any target that needs it
 link_directories( ${LLVM_LIBDIR} )
 
 # Setup prepare_builtins tools
 add_executable( prepare_builtins utils/prepare-builtins.cpp )
 target_compile_options( prepare_builtins PRIVATE ${LLVM_CXX_FLAGS} )
 target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} )
 target_link_libraries( prepare_builtins PRIVATE ${LLVM_LIBS} )