maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Driver] Support -gz=zstd 

The driver option translates to --compress-debug-sections=zstd cc1/cc1as/GNU
assembler/linker options.

`clang -g -gz=zstd -c a.c` generates ELFCOMPRESS_ZSTD compressed debug info
sections if compression decreases size.
This commit is contained in:
Fangrui Song 2022-09-08 01:39:06 -07:00
parent 96cb7c2273
commit a0365abad8
11 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticDriverKinds.td
View File

@ -406,7 +406,7 @@ def warn_missing_sysroot : Warning<"no such sysroot directory: '%0'">,
InGroup<DiagGroup<"missing-sysroot">>;
def warn_incompatible_sysroot : Warning<"using sysroot for '%0' but targeting '%1'">,
InGroup<DiagGroup<"incompatible-sysroot">>;
def warn_debug_compression_unavailable : Warning<"cannot compress debug sections (zlib not enabled)">,
def warn_debug_compression_unavailable : Warning<"cannot compress debug sections (%0 not enabled)">,
InGroup<DiagGroup<"debug-compression-unavailable">>;
def warn_drv_disabling_vptr_no_rtti_default : Warning<
"implicitly disabling vptr sanitizer because rtti wasn't enabled">,

4
clang/include/clang/Driver/Options.td
View File

@ -5273,8 +5273,8 @@ def record_command_line : Separate<["-"], "record-command-line">,
HelpText<"The string to embed in the .LLVM.command.line section.">,
MarshallingInfoString<CodeGenOpts<"RecordCommandLine">>;
def compress_debug_sections_EQ : Joined<["-", "--"], "compress-debug-sections=">,
HelpText<"DWARF debug sections compression type">, Values<"none,zlib">,
NormalizedValuesScope<"llvm::DebugCompressionType">, NormalizedValues<["None", "Z"]>,
HelpText<"DWARF debug sections compression type">, Values<"none,zlib,zstd">,
NormalizedValuesScope<"llvm::DebugCompressionType">, NormalizedValues<["None", "Z", "Zstd"]>,
MarshallingInfoEnum<CodeGenOpts<"CompressDebugSections">, "None">;
def compress_debug_sections : Flag<["-", "--"], "compress-debug-sections">,
Alias<compress_debug_sections_EQ>, AliasArgs<["zlib"]>;

9
clang/lib/Driver/ToolChains/Clang.cpp
View File

@ -1146,7 +1146,14 @@ static void RenderDebugInfoCompressionArgs(const ArgList &Args,
CmdArgs.push_back(
Args.MakeArgString("--compress-debug-sections=" + Twine(Value)));
} else {
D.Diag(diag::warn_debug_compression_unavailable);
D.Diag(diag::warn_debug_compression_unavailable) << "zlib";
}
} else if (Value == "zstd") {
if (llvm::compression::zstd::isAvailable()) {
CmdArgs.push_back(
Args.MakeArgString("--compress-debug-sections=" + Twine(Value)));
} else {
D.Diag(diag::warn_debug_compression_unavailable) << "zstd";
}
} else {
D.Diag(diag::err_drv_unsupported_option_argument)

2
clang/lib/Driver/ToolChains/CommonArgs.cpp
View File

@ -285,7 +285,7 @@ void tools::addLinkerCompressDebugSectionsOption(
// argument.
if (const Arg *A = Args.getLastArg(options::OPT_gz_EQ)) {
StringRef V = A->getValue();
if (V == "none" || V == "zlib")
if (V == "none" || V == "zlib" || V == "zstd")
CmdArgs.push_back(Args.MakeArgString("--compress-debug-sections=" + V));
else
TC.getDriver().Diag(diag::err_drv_unsupported_option_argument)

2
clang/lib/Driver/ToolChains/Gnu.cpp
View File

@ -730,7 +730,7 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
CmdArgs.push_back("--compress-debug-sections");
} else {
StringRef Value = A->getValue();
if (Value == "none" || Value == "zlib") {
if (Value == "none" || Value == "zlib" || Value == "zstd") {
CmdArgs.push_back(
Args.MakeArgString("--compress-debug-sections=" + Twine(Value)));
} else {

1
clang/test/CMakeLists.txt
View File

@ -12,6 +12,7 @@ llvm_canonicalize_cmake_booleans(
CLANG_SPAWN_CC1
ENABLE_BACKTRACES
LLVM_ENABLE_ZLIB
LLVM_ENABLE_ZSTD
LLVM_ENABLE_PER_TARGET_RUNTIME_DIR
LLVM_ENABLE_THREADS
LLVM_WITH_Z3

8
clang/test/Driver/compress-unavailable.s Normal file
View File

@ -0,0 +1,8 @@
// RUN: %clang -### -fintegrated-as -gz=none -c %s 2>&1 | FileCheck %s --check-prefix=NOWARN
// NOWARN-NOT: warning: cannot compress debug sections (zlib not enabled)
// RUN: %if !zlib %{ %clang -### -fintegrated-as -gz -c %s 2>&1 | FileCheck %s --check-prefix=WARN-ZLIB %}
// WARN-ZLIB: warning: cannot compress debug sections (zlib not enabled)
// RUN: %if !zstd %{ %clang -### -fintegrated-as -gz=zstd -c %s 2>&1 | FileCheck %s --check-prefix=WARN-ZSTD %}
// WARN-ZSTD: warning: cannot compress debug sections (zstd not enabled)

7
clang/test/Driver/compress-zstd.c Normal file
View File

@ -0,0 +1,7 @@
// REQUIRES: zstd
// RUN: %clang -### --target=aarch64-unknown-linux-gnu -gz=zstd -x assembler %s 2>&1 | FileCheck %s
// RUN: %clang -### --target=x86_64-pc-freebsd -gz=zstd %s 2>&1 | FileCheck %s
// CHECK: {{"-cc1(as)?".* "--compress-debug-sections=zstd"}}
// CHECK: "--compress-debug-sections=zstd"

7
clang/test/Driver/nozlibcompress.c
View File

@ -1,7 +0,0 @@
// REQUIRES: !zlib
// RUN: %clang -### -fintegrated-as -gz -c %s 2>&1 | FileCheck %s -check-prefix CHECK-WARN
// RUN: %clang -### -fintegrated-as -gz=none -c %s 2>&1 | FileCheck -allow-empty -check-prefix CHECK-NOWARN %s
// CHECK-WARN: warning: cannot compress debug sections (zlib not enabled)
// CHECK-NOWARN-NOT: warning: cannot compress debug sections (zlib not enabled)

1
clang/test/Misc/cc1as-compress.s
View File

@ -3,3 +3,4 @@
// RUN: %clang -cc1as -triple i686 --compress-debug-sections %s -o /dev/null
// RUN: %clang -cc1as -triple i686 -compress-debug-sections=zlib %s -o /dev/null
// RUN: %if zstd %{ %clang -cc1as -triple x86_64 -compress-debug-sections=zstd %s -o /dev/null %}

1
clang/test/lit.site.cfg.py.in
View File

@ -21,6 +21,7 @@ config.host_cc = "@CMAKE_C_COMPILER@"
config.host_cxx = "@CMAKE_CXX_COMPILER@"
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
config.have_zlib = @LLVM_ENABLE_ZLIB@
config.have_zstd = @LLVM_ENABLE_ZSTD@
config.clang_arcmt = @CLANG_ENABLE_ARCMT@
config.clang_default_pie_on_linux = @CLANG_DEFAULT_PIE_ON_LINUX@
config.clang_enable_opaque_pointers = @CLANG_ENABLE_OPAQUE_POINTERS_INTERNAL@