MaskRay created this revision.
MaskRay added reviewers: kongyi, ziangwan.
Herald added subscribers: cfe-commits, srhines.
Herald added a project: clang.
Also fix some style issues after D63105 <https://reviews.llvm.org/D63105>.
Repository:
rC Clang
https://reviews.llvm.org/D63822
Files:
docs/CommandGuide/clang.rst
include/clang/Driver/Options.td
lib/Driver/Driver.cpp
lib/Frontend/CompilerInvocation.cpp
test/Driver/print-supported-cpus.c
tools/driver/cc1_main.cpp
Index: tools/driver/cc1_main.cpp
===================================================================
--- tools/driver/cc1_main.cpp
+++ tools/driver/cc1_main.cpp
@@ -169,8 +169,8 @@
static void ensureSufficientStack() {}
#endif
-/// print supported cpus of the given target
-int PrintSupportedCPUs(std::string TargetStr) {
+/// Print supported cpus of the given target.
+static int PrintSupportedCPUs(std::string TargetStr) {
std::string Error;
const llvm::Target *TheTarget =
llvm::TargetRegistry::lookupTarget(TargetStr, Error);
@@ -219,10 +219,9 @@
if (Clang->getFrontendOpts().TimeTrace)
llvm::timeTraceProfilerInitialize();
- // --print-supported-cpus takes priority over the actual compilation
- if (Clang->getFrontendOpts().PrintSupportedCPUs) {
+ // -mcpu=? takes priority over the actual compilation.
+ if (Clang->getFrontendOpts().PrintSupportedCPUs)
return PrintSupportedCPUs(Clang->getTargetOpts().Triple);
- }
// Infer the builtin include path if unspecified.
if (Clang->getHeaderSearchOpts().UseBuiltinIncludes &&
Index: test/Driver/print-supported-cpus.c
===================================================================
--- test/Driver/print-supported-cpus.c
+++ test/Driver/print-supported-cpus.c
@@ -1,35 +1,23 @@
-// Test that the --print-supported-cpus flag works
-// Also test its aliases: -mcpu=? and -mtune=?
+// Test that -mcpu=? or -mtune=? lists supported CPU models.
// REQUIRES: x86-registered-target
// REQUIRES: arm-registered-target
-// RUN: %clang --target=x86_64-unknown-linux-gnu \
-// RUN: --print-supported-cpus 2>&1 \
-// RUN: | FileCheck %s --check-prefix=CHECK-X86
+// RUN: %clang --target=x86_64-unknown-linux-gnu -mcpu=? 2>&1 | \
+// RUN: FileCheck %s --check-prefix=CHECK-X86
+
+// RUN: %clang --target=x86_64-unknown-linux-gnu -mtune=? -fuse-ld=dummy 2>&1 | \
+// RUN: FileCheck %s --check-prefix=CHECK-X86
+
+// CHECK-NOT: warning: argument unused during compilation
// CHECK-X86: Target: x86_64-unknown-linux-gnu
// CHECK-X86: corei7
// CHECK-X86: Use -mcpu or -mtune to specify the target's processor.
-// RUN: %clang --target=x86_64-unknown-linux-gnu \
-// RUN: -mcpu=? 2>&1 \
-// RUN: | FileCheck %s --check-prefix=CHECK-X86-MCPU
-// CHECK-X86-MCPU: Target: x86_64-unknown-linux-gnu
-// CHECK-X86-MCPU: corei7
-// CHECK-X86-MCPU: Use -mcpu or -mtune to specify the target's processor.
+// RUN: %clang --target=arm-unknown-linux-android -mcpu=? 2>&1 | \
+// RUN: FileCheck %s --check-prefix=CHECK-ARM
-// RUN: %clang --target=arm-unknown-linux-android \
-// RUN: --print-supported-cpus 2>&1 \
-// RUN: | FileCheck %s --check-prefix=CHECK-ARM
// CHECK-ARM: Target: arm-unknown-linux-android
// CHECK-ARM: cortex-a73
// CHECK-ARM: cortex-a75
// CHECK-ARM: Use -mcpu or -mtune to specify the target's processor.
-
-// RUN: %clang --target=arm-unknown-linux-android \
-// RUN: -mtune=? 2>&1 \
-// RUN: | FileCheck %s --check-prefix=CHECK-ARM-MTUNE
-// CHECK-ARM-MTUNE: Target: arm-unknown-linux-android
-// CHECK-ARM-MTUNE: cortex-a73
-// CHECK-ARM-MTUNE: cortex-a75
-// CHECK-ARM-MTUNE: Use -mcpu or -mtune to specify the target's processor.
Index: lib/Frontend/CompilerInvocation.cpp
===================================================================
--- lib/Frontend/CompilerInvocation.cpp
+++ lib/Frontend/CompilerInvocation.cpp
@@ -1784,7 +1784,7 @@
Opts.ShowHelp = Args.hasArg(OPT_help);
Opts.ShowStats = Args.hasArg(OPT_print_stats);
Opts.ShowTimers = Args.hasArg(OPT_ftime_report);
- Opts.PrintSupportedCPUs = Args.hasArg(OPT__print_supported_cpus);
+ Opts.PrintSupportedCPUs = Args.hasArg(OPT_mcpu_EQ_QUESTION);
Opts.TimeTrace = Args.hasArg(OPT_ftime_trace);
Opts.ShowVersion = Args.hasArg(OPT_version);
Opts.ASTMergeFiles = Args.getAllArgValues(OPT_ast_merge);
Index: lib/Driver/Driver.cpp
===================================================================
--- lib/Driver/Driver.cpp
+++ lib/Driver/Driver.cpp
@@ -280,6 +280,7 @@
// -{fsyntax-only,-analyze,emit-ast} only run up to the compiler.
} else if ((PhaseArg = DAL.getLastArg(options::OPT_fsyntax_only)) ||
+ (PhaseArg = DAL.getLastArg(options::OPT_mcpu_EQ_QUESTION)) ||
(PhaseArg = DAL.getLastArg(options::OPT_module_file_info)) ||
(PhaseArg = DAL.getLastArg(options::OPT_verify_pch)) ||
(PhaseArg = DAL.getLastArg(options::OPT_rewrite_objc)) ||
@@ -1673,7 +1674,7 @@
if (C.getArgs().hasArg(options::OPT_v) ||
C.getArgs().hasArg(options::OPT__HASH_HASH_HASH) ||
- C.getArgs().hasArg(options::OPT__print_supported_cpus)) {
+ C.getArgs().hasArg(options::OPT_mcpu_EQ_QUESTION)) {
PrintVersion(C, llvm::errs());
SuppressMissingInputWarning = true;
}
@@ -3377,17 +3378,16 @@
Args.ClaimAllArgs(options::OPT_cl_compile_Group);
}
- // if the user specify --print-supported-cpus, or use -mcpu=?, or use
- // -mtune=? (aliases), clang will only print out supported cpu names
+ // If the user specify -mcpu=? or -mtune=?, print out supported cpu models
// without doing compilation.
- if (Arg *A = Args.getLastArg(options::OPT__print_supported_cpus)) {
- // the compilation now has only two phases: Input and Compile
- // use the --prints-supported-cpus flag as the dummy input to cc1
+ if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ_QUESTION)) {
+ // The compilation has only one phase: Compile. Use the -mcpu=? flag as the
+ // dummy input to cc1.
Actions.clear();
Action *InputAc = C.MakeAction<InputAction>(*A, types::TY_C);
Actions.push_back(
C.MakeAction<PrecompileJobAction>(InputAc, types::TY_Nothing));
- // claim all the input files to prevent argument unused warnings
+ // Claim all the input files to prevent argument unused warnings.
for (auto &I : Inputs) {
const Arg *InputArg = I.second;
InputArg->claim();
Index: include/clang/Driver/Options.td
===================================================================
--- include/clang/Driver/Options.td
+++ include/clang/Driver/Options.td
@@ -2644,12 +2644,11 @@
def s : Flag<["-"], "s">, Group<Link_Group>;
def target : Joined<["--"], "target=">, Flags<[DriverOption, CoreOption]>,
HelpText<"Generate code for the given target">;
-def _print_supported_cpus : Flag<["-", "--"], "print-supported-cpus">,
+def mcpu_EQ_QUESTION : Flag<["-"], "mcpu=?">,
Group<CompileOnly_Group>, Flags<[CC1Option, CoreOption]>,
HelpText<"Print supported cpu models for the given target (if target is not specified,"
" it will print the supported cpus for the default target)">;
-def mcpu_EQ_QUESTION : Flag<["-"], "mcpu=?">, Alias<_print_supported_cpus>;
-def mtune_EQ_QUESTION : Flag<["-"], "mtune=?">, Alias<_print_supported_cpus>;
+def mtune_EQ_QUESTION : Flag<["-"], "mtune=?">, Alias<mcpu_EQ_QUESTION>;
def gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[DriverOption]>,
HelpText<"Use the gcc toolchain at the given directory">;
def time : Flag<["-"], "time">,
Index: docs/CommandGuide/clang.rst
===================================================================
--- docs/CommandGuide/clang.rst
+++ docs/CommandGuide/clang.rst
@@ -324,16 +324,12 @@
When building for iPhone OS, specify the minimum version supported by your
application.
-.. option:: --print-supported-cpus
+.. option:: -mcpu=?, -mtune=?
Print out a list of supported processors for the given target (specified
through --target=<architecture> or -arch <architecture>). If no target is
specified, the system default target will be used.
-.. option:: -mcpu=?, -mtune=?
-
- Aliases of --print-supported-cpus
-
.. option:: -march=<cpu>
Specify that Clang should generate code for a specific processor family
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
