[llvm] 9239cde - [gn build] Port 2700da5fe28d (lld/unittests etc)
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Tue Jun 13 19:46:15 PDT 2023
Author: Nico Weber
Date: 2023-06-13T19:45:34-07:00
New Revision: 9239cde390e2c8e7cc4ffd13bff7030a5172c805
URL: https://github.com/llvm/llvm-project/commit/9239cde390e2c8e7cc4ffd13bff7030a5172c805
DIFF: https://github.com/llvm/llvm-project/commit/9239cde390e2c8e7cc4ffd13bff7030a5172c805.diff
LOG: [gn build] Port 2700da5fe28d (lld/unittests etc)
Added:
llvm/utils/gn/secondary/lld/unittests/AsLibALL/BUILD.gn
llvm/utils/gn/secondary/lld/unittests/AsLibELF/BUILD.gn
llvm/utils/gn/secondary/lld/unittests/BUILD.gn
Modified:
llvm/utils/gn/secondary/lld/Common/BUILD.gn
llvm/utils/gn/secondary/lld/test/BUILD.gn
llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
Removed:
################################################################################
diff --git a/llvm/utils/gn/secondary/lld/Common/BUILD.gn b/llvm/utils/gn/secondary/lld/Common/BUILD.gn
index 0d5713b6fd3f9..b5286545f867d 100644
--- a/llvm/utils/gn/secondary/lld/Common/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/Common/BUILD.gn
@@ -35,6 +35,7 @@ static_library("Common") {
"Args.cpp",
"CommonLinkerContext.cpp",
"DWARF.cpp",
+ "DriverDispatcher.cpp",
"ErrorHandler.cpp",
"Filesystem.cpp",
"Memory.cpp",
diff --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index 01ee607e582eb..06256e1ba161b 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -3,28 +3,42 @@ import("//llvm/triples.gni")
import("//llvm/utils/gn/build/libs/xml/enable.gni")
import("//llvm/utils/gn/build/libs/zlib/enable.gni")
import("//llvm/utils/gn/build/write_cmake_config.gni")
+import("//llvm/utils/llvm-lit/lit_path_function.gni")
import("lld_lit_site_cfg_files.gni")
-write_cmake_config("lit_site_cfg") {
+# The bits common to writing lit.site.cfg.py.in and Unit/lit.site.cfg.py.in.
+template("write_lit_cfg") {
+ write_cmake_config(target_name) {
+ input = invoker.input
+ output = invoker.output
+ values = [
+ "LIT_SITE_CFG_IN_HEADER=" +
+ "## Autogenerated from $input, do not edit\n\n" + lit_path_function,
+ "LLD_BINARY_DIR=" +
+ rebase_path(get_label_info("//lld", "target_out_dir")),
+ "CURRENT_LIBS_DIR=", # FIXME: for shared builds only (?)
+ "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
+ "LLD_SOURCE_DIR=" + rebase_path("//lld"),
+ "LLVM_BINARY_DIR=" +
+ rebase_path(get_label_info("//llvm", "target_out_dir")),
+ "LLVM_SOURCE_DIR=" + rebase_path("//llvm"),
+ "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
+ ]
+ values += invoker.extra_values
+ }
+}
+
+write_lit_cfg("lit_site_cfg") {
# Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
input = "//lld/test/lit.site.cfg.py.in"
output = lld_lit_site_cfg_file
dir = get_path_info(output, "dir")
- values = [
- "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
- "LLD_BINARY_DIR=" + rebase_path(get_label_info("//lld", "target_out_dir")),
- "CURRENT_LIBS_DIR=", # FIXME: for shared builds only (?)
- "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
+ extra_values = [
"ENABLE_BACKTRACES=1",
- "LLD_SOURCE_DIR=" + rebase_path("//lld"),
- "LLVM_BINARY_DIR=" +
- rebase_path(get_label_info("//llvm", "target_out_dir")),
"LLVM_HOST_TRIPLE=$llvm_current_triple",
"LLVM_LIBS_DIR=", # needed only for shared builds
"LLVM_LIT_TOOLS_DIR=", # Intentionally empty, matches cmake build.
- "LLVM_SOURCE_DIR=" + rebase_path("//llvm"),
- "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
"Python3_EXECUTABLE=$python_path",
"LLVM_TARGET_TRIPLE=$llvm_target_triple",
@@ -35,7 +49,7 @@ write_cmake_config("lit_site_cfg") {
]
if (host_os == "win") {
- values += [
+ extra_values += [
"LLVM_LIT_ERRC_MESSAGES=no such file or directory;is a directory;" +
"invalid argument;permission denied",
"LLVM_ENABLE_PLUGINS=0",
@@ -44,7 +58,7 @@ write_cmake_config("lit_site_cfg") {
"SHLIBDIR=" + rebase_path("$root_out_dir/bin", dir),
]
} else {
- values += [
+ extra_values += [
"LLVM_LIT_ERRC_MESSAGES=",
"LLVM_ENABLE_PLUGINS=1",
"SHLIBDIR=" + rebase_path("$root_out_dir/lib", dir),
@@ -52,36 +66,53 @@ write_cmake_config("lit_site_cfg") {
}
if (host_os == "mac") {
- values += [ "SHLIBEXT=.dylib" ]
+ extra_values += [ "SHLIBEXT=.dylib" ]
} else if (host_os == "win") {
- values += [ "SHLIBEXT=.dll" ]
+ extra_values += [ "SHLIBEXT=.dll" ]
} else {
- values += [ "SHLIBEXT=.so" ]
+ extra_values += [ "SHLIBEXT=.so" ]
}
if (llvm_enable_dia_sdk) {
- values += [ "LLVM_ENABLE_DIA_SDK=1" ]
+ extra_values += [ "LLVM_ENABLE_DIA_SDK=1" ]
} else {
- values += [ "LLVM_ENABLE_DIA_SDK=0" ] # Must be 0.
+ extra_values += [ "LLVM_ENABLE_DIA_SDK=0" ] # Must be 0.
}
if (llvm_enable_libxml2) {
- values += [ "LLVM_ENABLE_LIBXML2=1" ]
+ extra_values += [ "LLVM_ENABLE_LIBXML2=1" ]
} else {
- values += [ "LLVM_ENABLE_LIBXML2=0" ] # Must be 0.
+ extra_values += [ "LLVM_ENABLE_LIBXML2=0" ] # Must be 0.
}
if (llvm_enable_zlib) {
- values += [ "LLVM_ENABLE_ZLIB=1" ]
+ extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
} else {
- values += [ "LLVM_ENABLE_ZLIB=0" ] # Must be 0.
+ extra_values += [ "LLVM_ENABLE_ZLIB=0" ] # Must be 0.
}
if (current_cpu == "x64" || current_cpu == "arm64" ||
current_cpu == "ppc64") {
- values += [ "CMAKE_SIZEOF_VOID_P=8" ]
+ extra_values += [ "CMAKE_SIZEOF_VOID_P=8" ]
+ } else {
+ extra_values += [ "CMAKE_SIZEOF_VOID_P=4" ]
+ }
+}
+
+write_lit_cfg("lit_unit_site_cfg") {
+ # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
+ input = "//lld/test/Unit/lit.site.cfg.py.in"
+ output = lld_lit_unit_site_cfg_file
+ extra_values = [
+ "ENABLE_SHARED=0",
+ "LLVM_BUILD_MODE=.",
+ ]
+ dir = get_path_info(output, "dir")
+ if (host_os == "win") {
+ # See comment for Windows solink in llvm/utils/gn/build/toolchain/BUILD.gn
+ extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/bin", dir) ]
} else {
- values += [ "CMAKE_SIZEOF_VOID_P=4" ]
+ extra_values += [ "SHLIBDIR=" + rebase_path("$root_out_dir/lib", dir) ]
}
}
@@ -91,7 +122,9 @@ write_cmake_config("lit_site_cfg") {
group("test") {
deps = [
":lit_site_cfg",
+ ":lit_unit_site_cfg",
"//lld/tools/lld:symlinks",
+ "//lld/unittests",
"//llvm/tools/dsymutil",
"//llvm/tools/llc",
"//llvm/tools/llvm-ar:symlinks",
diff --git a/llvm/utils/gn/secondary/lld/unittests/AsLibALL/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/AsLibALL/BUILD.gn
new file mode 100644
index 0000000000000..d6af6a1c73792
--- /dev/null
+++ b/llvm/utils/gn/secondary/lld/unittests/AsLibALL/BUILD.gn
@@ -0,0 +1,14 @@
+import("//third-party/unittest/unittest.gni")
+
+unittest("LLDAsLibAllTests") {
+ configs += [ "//llvm/utils/gn/build:lld_code" ]
+ deps = [
+ "//lld/Common",
+ "//lld/COFF",
+ "//lld/ELF",
+ "//lld/MachO",
+ "//lld/MinGW",
+ "//lld/wasm",
+ ]
+ sources = [ "AllDrivers.cpp" ]
+}
diff --git a/llvm/utils/gn/secondary/lld/unittests/AsLibELF/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/AsLibELF/BUILD.gn
new file mode 100644
index 0000000000000..e22a0eec1ff02
--- /dev/null
+++ b/llvm/utils/gn/secondary/lld/unittests/AsLibELF/BUILD.gn
@@ -0,0 +1,13 @@
+import("//third-party/unittest/unittest.gni")
+
+unittest("LLDAsLibELFTests") {
+ configs += [ "//llvm/utils/gn/build:lld_code" ]
+ deps = [
+ "//lld/Common",
+ "//lld/ELF",
+ ]
+ sources = [
+ "ROCm.cpp",
+ "SomeDrivers.cpp",
+ ]
+}
diff --git a/llvm/utils/gn/secondary/lld/unittests/BUILD.gn b/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
new file mode 100644
index 0000000000000..c909670f4b1ba
--- /dev/null
+++ b/llvm/utils/gn/secondary/lld/unittests/BUILD.gn
@@ -0,0 +1,8 @@
+group("unittests") {
+ deps = [
+ "AsLibAll:LLDAsLibAllTests",
+ "AsLibELF:LLDAsLibELFTests",
+ ]
+ testonly = true
+}
+
diff --git a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
index f9b71bf33cd04..5d3497e7e0044 100644
--- a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
@@ -31,6 +31,7 @@ write_cmake_config("llvm-lit") {
"//clang/test:lit_site_cfg",
"//clang/test:lit_unit_site_cfg",
"//lld/test:lit_site_cfg",
+ "//lld/test:lit_unit_site_cfg",
"//lldb/test:lit_api_site_cfg",
"//lldb/test:lit_shell_site_cfg",
"//lldb/test:lit_site_cfg",
More information about the llvm-commits
mailing list