This is an archive of the discontinued LLVM Phabricator instance.

Differential D105419

libclc: fix build since recent opencl-c-base.h default include changes.
AbandonedPublic

Authored by airlied on Jul 5 2021, 12:11 AM.

Details

Reviewers
Anastasia
jvesely
Summary

Since cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce
Author: Anastasia Stulova <anastasia.stulova@arm.com>
Date: Mon Feb 22 11:05:52 2021 +0000

[OpenCL] Add builtin declarations by default.

libclc won't configure or build.

Diff Detail

Event Timeline

airlied created this revision.Jul 5 2021, 12:11 AM
Herald added subscribers: ldrumm, jvesely, kristof.beyls and 2 others. · View Herald TranscriptJul 5 2021, 12:11 AM
airlied requested review of this revision.Jul 5 2021, 12:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 5 2021, 12:11 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B112406: Diff 356441.Jul 5 2021, 12:28 AM
Anastasia added a comment.Jul 5 2021, 4:25 AM

I am happy with the fix but this seems to overlap with https://reviews.llvm.org/D99794? As I am not very experienced with libclc would it be possible to sync with @jvesely?

Anastasia added a reviewer: jvesely.Jul 5 2021, 4:25 AM
airlied abandoned this revision.Jul 14 2021, 5:47 PM

fixed alternate way.

Revision Contents

PathSize
libclc/
2 lines
cmake/
2 lines

Diff 356441

libclc/CMakeLists.txt

Context not available.
target_compile_definitions( builtins.link.${arch_suffix} PRIVATE target_compile_definitions( builtins.link.${arch_suffix} PRIVATE
${CLC_TARGET_DEFINE} ) ${CLC_TARGET_DEFINE} )
target_compile_options( builtins.link.${arch_suffix} PRIVATE -target target_compile_options( builtins.link.${arch_suffix} PRIVATE -target
${t} ${mcpu} -fno-builtin -nostdlib ${build_flags} ) ${t} ${mcpu} -cl-no-stdinc -fno-builtin -nostdlib ${build_flags} )
set_target_properties( builtins.link.${arch_suffix} PROPERTIES set_target_properties( builtins.link.${arch_suffix} PROPERTIES
LINKER_LANGUAGE CLC ) LINKER_LANGUAGE CLC )
Context not available.

libclc/cmake/CMakeLLAsmInformation.cmake

if(NOT CMAKE_LLAsm_COMPILE_OBJECT) if(NOT CMAKE_LLAsm_COMPILE_OBJECT)
set(CMAKE_LLAsm_COMPILE_OBJECT set(CMAKE_LLAsm_COMPILE_OBJECT
"${CMAKE_LLAsm_PREPROCESSOR} -E -P <DEFINES> <INCLUDES> <FLAGS> -x cl <SOURCE> -o <OBJECT>.temp" "${CMAKE_LLAsm_PREPROCESSOR} -E -P -cl-no-stdinc <DEFINES> <INCLUDES> <FLAGS> -x cl <SOURCE> -o <OBJECT>.temp"
"<CMAKE_LLAsm_COMPILER> -o <OBJECT> <OBJECT>.temp") "<CMAKE_LLAsm_COMPILER> -o <OBJECT> <OBJECT>.temp")
endif() endif()