This is an archive of the discontinued LLVM Phabricator instance.

Differential D158113

[Driver][DXC] Accept debug flags (/Zi and /Qembed_debug)
ClosedPublic

Authored by bogner on Aug 16 2023, 1:29 PM.

Details

Reviewers
beanz
Commits
rGbe5c8dea1e1d: [Driver][DXC] Accept debug flags (/Zi and /Qembed_debug)
Summary

This adds /Zi handling and explicitly ignores /Qembed_debug, which
should make our command line handling compatible enough with dxc that
we can share logic on compiler explorer.

Diff Detail

Event Timeline

bogner created this revision.Aug 16 2023, 1:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 16 2023, 1:29 PM
Herald added a subscriber: mcrosier. · View Herald Transcript
bogner requested review of this revision.Aug 16 2023, 1:29 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 16 2023, 1:29 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B253027: Diff 550862.Aug 16 2023, 1:29 PM
beanz accepted this revision.Aug 17 2023, 12:48 PM
This revision is now accepted and ready to land.Aug 17 2023, 12:48 PM
This revision was landed with ongoing or failed builds.Aug 17 2023, 4:19 PM
Closed by commit rGbe5c8dea1e1d: [Driver][DXC] Accept debug flags (/Zi and /Qembed_debug) (authored by bogner). · Explain Why
This revision was automatically updated to reflect the committed changes.
bogner added a commit: rGbe5c8dea1e1d: [Driver][DXC] Accept debug flags (/Zi and /Qembed_debug).

Revision Contents

PathSize
clang/
include/
clang/
Driver/
5 lines
test/
Driver/
14 lines

Diff 550862

clang/include/clang/Driver/Options.td

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 7,844 Lines • ▼ Show 20 Linesdef _SLASH_ZH_MD5 : CLFlag<"ZH:MD5">,
HelpText<"Use MD5 for file checksums in debug info (default)">, HelpText<"Use MD5 for file checksums in debug info (default)">,
Alias<gsrc_hash_EQ>, AliasArgs<["md5"]>; Alias<gsrc_hash_EQ>, AliasArgs<["md5"]>;
def _SLASH_ZH_SHA1 : CLFlag<"ZH:SHA1">, def _SLASH_ZH_SHA1 : CLFlag<"ZH:SHA1">,
HelpText<"Use SHA1 for file checksums in debug info">, HelpText<"Use SHA1 for file checksums in debug info">,
Alias<gsrc_hash_EQ>, AliasArgs<["sha1"]>; Alias<gsrc_hash_EQ>, AliasArgs<["sha1"]>;
def _SLASH_ZH_SHA_256 : CLFlag<"ZH:SHA_256">, def _SLASH_ZH_SHA_256 : CLFlag<"ZH:SHA_256">,
HelpText<"Use SHA256 for file checksums in debug info">, HelpText<"Use SHA256 for file checksums in debug info">,
Alias<gsrc_hash_EQ>, AliasArgs<["sha256"]>; Alias<gsrc_hash_EQ>, AliasArgs<["sha256"]>;
def _SLASH_Zi : CLFlag<"Zi">, Alias<g_Flag>, def _SLASH_Zi : CLFlag<"Zi", [CLOption, DXCOption]>, Alias<g_Flag>,
HelpText<"Like /Z7">; HelpText<"Like /Z7">;
def _SLASH_Zp : CLJoined<"Zp">, def _SLASH_Zp : CLJoined<"Zp">,
HelpText<"Set default maximum struct packing alignment">, HelpText<"Set default maximum struct packing alignment">,
Alias<fpack_struct_EQ>; Alias<fpack_struct_EQ>;
def _SLASH_Zp_flag : CLFlag<"Zp">, def _SLASH_Zp_flag : CLFlag<"Zp">,
HelpText<"Set default maximum struct packing alignment to 1">, HelpText<"Set default maximum struct packing alignment to 1">,
Alias<fpack_struct_EQ>, AliasArgs<["1"]>; Alias<fpack_struct_EQ>, AliasArgs<["1"]>;
def _SLASH_Zs : CLFlag<"Zs">, HelpText<"Run the preprocessor, parser and semantic analysis stages">, def _SLASH_Zs : CLFlag<"Zs">, HelpText<"Run the preprocessor, parser and semantic analysis stages">,
▲ Show 20 Lines • Show All 316 Lines • ▼ Show 20 Lines
def dxc_entrypoint : Option<["--", "/", "-"], "E", KIND_JOINED_OR_SEPARATE>, def dxc_entrypoint : Option<["--", "/", "-"], "E", KIND_JOINED_OR_SEPARATE>,
Group<dxc_Group>, Group<dxc_Group>,
Flags<[NoXarchOption]>, Visibility<[DXCOption]>, Flags<[NoXarchOption]>, Visibility<[DXCOption]>,
HelpText<"Entry point name">; HelpText<"Entry point name">;
def dxc_validator_path_EQ : Joined<["--"], "dxv-path=">, Group<dxc_Group>, def dxc_validator_path_EQ : Joined<["--"], "dxv-path=">, Group<dxc_Group>,
HelpText<"DXIL validator installation path">; HelpText<"DXIL validator installation path">;
def dxc_disable_validation : DXCFlag<"Vd">, def dxc_disable_validation : DXCFlag<"Vd">,
HelpText<"Disable validation">; HelpText<"Disable validation">;
def : Option<["/", "-"], "Qembed_debug", KIND_FLAG>, Group<dxc_Group>,
Flags<[Ignored, NoXarchOption]>, Visibility<[DXCOption]>,
HelpText<"Embed PDB in shader container (ignored)">;

clang/test/Driver/dxc_debug.hlsl

  • This file was added.
// RUN: %clang_dxc -Tlib_6_7 -### -g %s 2>&1 | FileCheck %s
// RUN: %clang_dxc -Tlib_6_7 -### /Zi %s 2>&1 | FileCheck %s
// RUN: %clang_dxc -Tlib_6_7 -### /Zi /Qembed_debug %s 2>&1 | FileCheck %s
// RUN: %clang_dxc -Tlib_6_7 -### -Zi %s 2>&1 | FileCheck %s
// RUN: %clang_dxc -Tlib_6_7 -### -Zi -Qembed_debug %s 2>&1 | FileCheck %s
// RUN: %clang_dxc -Tlib_6_7 -### -Zi -gcodeview %s 2>&1 | FileCheck %s -check-prefixes=CHECK,CHECK-CV
// RUN: %clang_dxc -Tlib_6_7 -### -Zi -gdwarf %s 2>&1 | FileCheck %s -check-prefixes=CHECK,CHECK-DWARF
// RUN: %clang_dxc -Tlib_6_7 -### -gcodeview -Zi %s 2>&1 | FileCheck %s -check-prefixes=CHECK,CHECK-CV
// RUN: %clang_dxc -Tlib_6_7 -### -gdwarf -Zi %s 2>&1 | FileCheck %s -check-prefixes=CHECK,CHECK-DWARF
// CHECK: "-cc1"
// CHECK-CV-SAME: -gcodeview
// CHECK-SAME: "-debug-info-kind=constructor"
// CHECK-DWARF-SAME: -dwarf-version