Skip to content

[CIR][cmake] Add support for cmake variable CLANG_ENABLE_CIR #86078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Apr 11, 2024
Merged

[CIR][cmake] Add support for cmake variable CLANG_ENABLE_CIR #86078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d8c8302
[𝘀𝗽𝗿] initial version
lanza Mar 21, 2024
ca9e9e5
[𝘀𝗽𝗿] changes to main this commit is based on
lanza Mar 21, 2024
0118187
add lit usage
lanza Mar 21, 2024
c8bf045
[𝘀𝗽𝗿] changes introduced through rebase
lanza Mar 21, 2024
ee6088d
rebase
lanza Mar 21, 2024
0a84fd1
[𝘀𝗽𝗿] changes introduced through rebase
lanza Mar 21, 2024
51daee2
rebase
lanza Mar 21, 2024
65d3dd7
[𝘀𝗽𝗿] changes introduced through rebase
lanza Mar 21, 2024
0af0a60
rebaserebase
lanza Mar 21, 2024
14c65e8
[𝘀𝗽𝗿] changes introduced through rebase
lanza Mar 21, 2024
a2903cb
rebase
lanza Mar 21, 2024
fe5d8ad
[𝘀𝗽𝗿] changes introduced through rebase
chelcassanova Apr 11, 2024
d07e400
rebase
lanza Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions clang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,13 @@ if(CLANG_ENABLE_LIBXML2)
endif()
endif()

if(CLANG_ENABLE_CIR)
if (NOT "${LLVM_ENABLE_PROJECTS}" MATCHES "MLIR|mlir")
message(FATAL_ERROR
"Cannot build ClangIR without MLIR in LLVM_ENABLE_PROJECTS")
endif()
endif()

include(CheckIncludeFile)
check_include_file(sys/resource.h CLANG_HAVE_RLIMITS)

Expand Down
Empty file added clang/include/clang/CIR/CMakeLists.txt
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions clang/include/clang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
add_subdirectory(AST)
add_subdirectory(Basic)
if(CLANG_ENABLE_CIR)
add_subdirectory(CIR)
endif()
add_subdirectory(Driver)
add_subdirectory(Parse)
add_subdirectory(Sema)
Expand Down
3 changes: 3 additions & 0 deletions clang/include/clang/Config/config.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,7 @@
/* Spawn a new process clang.exe for the CC1 tool invocation, when necessary */
#cmakedefine01 CLANG_SPAWN_CC1

/* Whether CIR is built into Clang */
#cmakedefine01 CLANG_ENABLE_CIR

#endif
Empty file added clang/lib/CIR/CMakeLists.txt
View file
Open in desktop
Empty file.
4 changes: 4 additions & 0 deletions clang/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ if(CLANG_INCLUDE_TESTS)
endif()
add_subdirectory(Interpreter)
add_subdirectory(Support)

if(CLANG_ENABLE_CIR)
add_subdirectory(CIR)
endif()
1 change: 1 addition & 0 deletions clang/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ llvm_canonicalize_cmake_booleans(
CLANG_ENABLE_STATIC_ANALYZER
CLANG_PLUGIN_SUPPORT
CLANG_SPAWN_CC1
CLANG_ENABLE_CIR
ENABLE_BACKTRACES
LLVM_ENABLE_ZLIB
LLVM_ENABLE_ZSTD
Expand Down
1 change: 1 addition & 0 deletions clang/test/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ config.clang_default_pie_on_linux = @CLANG_DEFAULT_PIE_ON_LINUX@
config.clang_default_cxx_stdlib = "@CLANG_DEFAULT_CXX_STDLIB@"
config.clang_staticanalyzer = @CLANG_ENABLE_STATIC_ANALYZER@
config.clang_staticanalyzer_z3 = @LLVM_WITH_Z3@
config.clang_enable_cir = @CLANG_ENABLE_CIR@
config.clang_examples = @CLANG_BUILD_EXAMPLES@
config.enable_shared = @ENABLE_SHARED@
config.enable_backtrace = @ENABLE_BACKTRACES@
Expand Down