From 82a2911a94947e20ac4fd961b6322adf74ad9224 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 17 Oct 2013 16:16:23 +0000 Subject: [PATCH] clang-cl: Add support for asm listings (/FA and /Fa) This adds support for outputing the assembly to a file during compilation. It does this by changing the compilation pipeling to not use the integrated assembler, and keep the intermediate assembler file. Differential Revision: http://llvm-reviews.chandlerc.com/D1946 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@192902 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/UsersManual.rst | 2 ++ include/clang/Driver/CLCompatOptions.td | 8 ++++++-- lib/Driver/Driver.cpp | 19 +++++++++++++++++-- lib/Driver/Types.cpp | 2 ++ test/Driver/cl-outputs.c | 15 +++++++++++++++ 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/docs/UsersManual.rst b/docs/UsersManual.rst index 37eb10c621..36cd39f8b2 100644 --- a/docs/UsersManual.rst +++ b/docs/UsersManual.rst @@ -1456,6 +1456,8 @@ Execute ``clang-cl /?`` to see a list of supported options: /c Compile only /D Define macro /fallback Fall back to cl.exe if clang-cl fails to compile + /FA Output assembly code file during compilation + /Fa Output assembly code to this file during compilation /Fe Set output executable file or directory (ends in / or \) /FI Include file before parsing /Fo Set output object file, or directory (ends in / or \) diff --git a/include/clang/Driver/CLCompatOptions.td b/include/clang/Driver/CLCompatOptions.td index bdbda6e335..075e71e353 100644 --- a/include/clang/Driver/CLCompatOptions.td +++ b/include/clang/Driver/CLCompatOptions.td @@ -112,6 +112,11 @@ def _SLASH_Zs : CLFlag<"Zs">, HelpText<"Syntax-check only">, def _SLASH_M_Group : OptionGroup<"">, Group; +def _SLASH_FA : CLFlag<"FA">, + HelpText<"Output assembly code file during compilation">; +def _SLASH_Fa : CLJoined<"Fa">, + HelpText<"Output assembly code to this file during compilation">, + MetaVarName<"">; def _SLASH_fallback : CLCompileFlag<"fallback">, HelpText<"Fall back to cl.exe if clang-cl fails to compile">; def _SLASH_FI : CLJoined<"FI">, @@ -165,8 +170,7 @@ def _SLASH_Zm : CLIgnoredJoined<"Zm">; def _SLASH_bigobj : CLFlag<"bigobj">; def _SLASH_EH : CLJoined<"EH">; -def _SLASH_FA : CLJoined<"FA">; -def _SLASH_Fa : CLJoined<"Fa">; +def _SLASH_FA_joined : CLJoined<"FA">; def _SLASH_Fd : CLJoined<"Fd">; def _SLASH_fp : CLJoined<"fp">; def _SLASH_Gd : CLFlag<"Gd">; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index ae62993a2f..101b83c711 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1446,6 +1446,8 @@ static const Tool *SelectToolForJob(Compilation &C, const ToolChain *TC, if (TC->useIntegratedAs() && !C.getArgs().hasArg(options::OPT_save_temps) && + !C.getArgs().hasArg(options::OPT__SLASH_FA) && + !C.getArgs().hasArg(options::OPT__SLASH_Fa) && isa(JA) && Inputs->size() == 1 && isa(*Inputs->begin())) { const Tool *Compiler = @@ -1568,8 +1570,10 @@ void Driver::BuildJobsForAction(Compilation &C, } } -/// \brief Create output filename based on ArgValue, which could either be a -/// full filename, filename without extension, or a directory. +/// \brief Create output filename based on ArgValue, which could either be a +/// full filename, filename without extension, or a directory. If ArgValue +/// does not provide a filename, then use BaseName, and use the extension +/// suitable for FileType. static const char *MakeCLOutputFilename(const ArgList &Args, StringRef ArgValue, StringRef BaseName, types::ID FileType) { SmallString<128> Filename = ArgValue; @@ -1617,6 +1621,17 @@ const char *Driver::GetNamedOutputPath(Compilation &C, (isa(JA) || JA.getType() == types::TY_ModuleFile)) return "-"; + // Is this the assembly listing for /FA? + if (JA.getType() == types::TY_PP_Asm && + (C.getArgs().hasArg(options::OPT__SLASH_FA) || + C.getArgs().hasArg(options::OPT__SLASH_Fa))) { + // Use /Fa and the input filename to determine the asm file name. + StringRef BaseName = llvm::sys::path::filename(BaseInput); + StringRef FaValue = C.getArgs().getLastArgValue(options::OPT__SLASH_Fa); + return C.addResultFile(MakeCLOutputFilename(C.getArgs(), FaValue, BaseName, + JA.getType()), &JA); + } + // Output to a temporary file? if ((!AtTopLevel && !C.getArgs().hasArg(options::OPT_save_temps) && !C.getArgs().hasArg(options::OPT__SLASH_Fo)) || diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index e569a2bf82..3b353041b2 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -49,6 +49,8 @@ const char *types::getTypeTempSuffix(ID Id, bool CLMode) { return "obj"; if (Id == TY_Image && CLMode) return "exe"; + if (Id == TY_PP_Asm && CLMode) + return "asm"; return getInfo(Id).TempSuffix; } diff --git a/test/Driver/cl-outputs.c b/test/Driver/cl-outputs.c index 82134b0562..4f586ae7ef 100644 --- a/test/Driver/cl-outputs.c +++ b/test/Driver/cl-outputs.c @@ -88,3 +88,18 @@ // RUN: %clang_cl /Fefoo /Febar -### -- %s 2>&1 | FileCheck -check-prefix=FeOVERRIDE %s // FeOVERRIDE: "-out:bar.exe" + + +// RUN: %clang_cl /FA -### -- %s 2>&1 | FileCheck -check-prefix=FA %s +// FA: "-o" "cl-outputs.asm" +// RUN: %clang_cl /FA /Fafoo -### -- %s 2>&1 | FileCheck -check-prefix=FaNAME %s +// RUN: %clang_cl /Fafoo -### -- %s 2>&1 | FileCheck -check-prefix=FaNAME %s +// FaNAME: "-o" "foo.asm" +// RUN: %clang_cl /FA /Faa.ext /Fab.ext -### -- %s 2>&1 | FileCheck -check-prefix=FaNAMEEXT %s +// FaNAMEEXT: "-o" "b.ext" +// RUN: %clang_cl /FA /Fafoo.dir/ -### -- %s 2>&1 | FileCheck -check-prefix=FaDIR %s +// FaDIR: "-o" "foo.dir{{[/\\]+}}cl-outputs.asm" +// RUN: %clang_cl /FA /Fafoo.dir/a -### -- %s 2>&1 | FileCheck -check-prefix=FaDIRNAME %s +// FaDIRNAME: "-o" "foo.dir{{[/\\]+}}a.asm" +// RUN: %clang_cl /FA /Fafoo.dir/a.ext -### -- %s 2>&1 | FileCheck -check-prefix=FaDIRNAMEEXT %s +// FaDIRNAMEEXT: "-o" "foo.dir{{[/\\]+}}a.ext" -- 2.40.0