Index: clang/docs/ClangCommandLineReference.rst =================================================================== --- clang/docs/ClangCommandLineReference.rst +++ clang/docs/ClangCommandLineReference.rst @@ -610,6 +610,10 @@ Generate code for the given target +.. option:: --print-supported-cpus + +Print supported cpu models for the given target + .. option:: -time Time individual commands Index: clang/docs/CommandGuide/clang.rst =================================================================== --- clang/docs/CommandGuide/clang.rst +++ clang/docs/CommandGuide/clang.rst @@ -324,6 +324,12 @@ When building for iPhone OS, specify the minimum version supported by your application. +.. option:: --print-supported-cpus + + Print out a list of supported processors for the given target (specified + through --target= or -arch ). If no target is + specified, the system default target will be used. + .. option:: -march= Specify that Clang should generate code for a specific processor family Index: clang/include/clang/Driver/Options.td =================================================================== --- clang/include/clang/Driver/Options.td +++ clang/include/clang/Driver/Options.td @@ -2627,6 +2627,10 @@ def s : Flag<["-"], "s">, Group; def target : Joined<["--"], "target=">, Flags<[DriverOption, CoreOption]>, HelpText<"Generate code for the given target">; +def _print_supported_cpus : Flag<["-", "--"], "print-supported-cpus">, + 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 gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[DriverOption]>, HelpText<"Use the gcc toolchain at the given directory">; def time : Flag<["-"], "time">, Index: clang/include/clang/Frontend/FrontendOptions.h =================================================================== --- clang/include/clang/Frontend/FrontendOptions.h +++ clang/include/clang/Frontend/FrontendOptions.h @@ -260,6 +260,9 @@ /// Show timers for individual actions. unsigned ShowTimers : 1; + /// print the supported cpus for the current target + unsigned PrintSupportedCPUs : 1; + /// Output time trace profile. unsigned TimeTrace : 1; Index: clang/lib/Driver/Driver.cpp =================================================================== --- clang/lib/Driver/Driver.cpp +++ clang/lib/Driver/Driver.cpp @@ -1671,7 +1671,8 @@ } if (C.getArgs().hasArg(options::OPT_v) || - C.getArgs().hasArg(options::OPT__HASH_HASH_HASH)) { + C.getArgs().hasArg(options::OPT__HASH_HASH_HASH) || + C.getArgs().hasArg(options::OPT__print_supported_cpus)) { PrintVersion(C, llvm::errs()); SuppressMissingInputWarning = true; } @@ -3375,6 +3376,16 @@ Args.ClaimAllArgs(options::OPT_cl_compile_Group); } + // If the use specify --print-supported-cpus, clang will only print out + // supported cpu names without doing compilation. + if (Arg *A = Args.getLastArg(options::OPT__print_supported_cpus)) { + Actions.clear(); + // the compilation now has only two phases: Input and Compile + // use the --prints-supported-cpus flag as the dummy input to cc1 + Action *InputAc = C.MakeAction(*A, types::TY_C); + Actions.push_back(C.MakeAction(InputAc, types::TY_Nothing)); + } + // Claim ignored clang-cl options. Args.ClaimAllArgs(options::OPT_cl_ignored_Group); Index: clang/lib/Frontend/CompilerInvocation.cpp =================================================================== --- clang/lib/Frontend/CompilerInvocation.cpp +++ clang/lib/Frontend/CompilerInvocation.cpp @@ -1752,6 +1752,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.TimeTrace = Args.hasArg(OPT_ftime_trace); Opts.ShowVersion = Args.hasArg(OPT_version); Opts.ASTMergeFiles = Args.getAllArgValues(OPT_ast_merge); Index: clang/test/Driver/print-supported-cpus.c =================================================================== --- /dev/null +++ clang/test/Driver/print-supported-cpus.c @@ -0,0 +1,16 @@ +// Test that the --print-supported-cpus flag works + +// RUN: %clang --target=x86_64-unknown-linux-gnu \ +// RUN: --print-supported-cpus 2>&1 \ +// RUN: | FileCheck %s --check-prefix=CHECK-X86 +// 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=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. Index: clang/tools/driver/cc1_main.cpp =================================================================== --- clang/tools/driver/cc1_main.cpp +++ clang/tools/driver/cc1_main.cpp @@ -13,6 +13,7 @@ //===----------------------------------------------------------------------===// #include "clang/Basic/Stack.h" +#include "clang/Basic/TargetOptions.h" #include "clang/CodeGen/ObjectFilePCHContainerOperations.h" #include "clang/Config/config.h" #include "clang/Driver/DriverDiagnostic.h" @@ -36,10 +37,12 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Path.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/TargetRegistry.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Support/TimeProfiler.h" #include "llvm/Support/Timer.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Target/TargetMachine.h" #include #ifdef CLANG_HAVE_RLIMITS @@ -166,6 +169,22 @@ static void ensureSufficientStack() {} #endif +/// print supported cpus of the given target +int PrintSupportedCPUs(std::string TargetStr) { + std::string Error; + const llvm::Target *TheTarget = llvm::TargetRegistry::lookupTarget(TargetStr, Error); + if (!TheTarget) { + llvm::errs() << Error; + return 1; + } + + // the target machine will handle the mcpu printing + llvm::TargetOptions Options; + std::unique_ptr TheTargetMachine( + TheTarget->createTargetMachine(TargetStr, "", "+cpuHelp", Options, None)); + return 0; +} + int cc1_main(ArrayRef Argv, const char *Argv0, void *MainAddr) { ensureSufficientStack(); @@ -199,6 +218,11 @@ if (Clang->getFrontendOpts().TimeTrace) llvm::timeTraceProfilerInitialize(); + // --print-supported-cpus 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 && Clang->getHeaderSearchOpts().ResourceDir.empty()) Index: llvm/lib/MC/MCSubtargetInfo.cpp =================================================================== --- llvm/lib/MC/MCSubtargetInfo.cpp +++ llvm/lib/MC/MCSubtargetInfo.cpp @@ -92,9 +92,16 @@ return MaxLen; } -/// Display help for feature choices. +/// Display help for feature and mcpu choices. static void Help(ArrayRef CPUTable, ArrayRef FeatTable) { + // the static variable ensures that the help information only gets + // printed once even though a target machine creates multiple subtargets + static bool PrintOnce = false; + if (PrintOnce) { + return; + } + // Determine the length of the longest CPU and Feature entries. unsigned MaxCPULen = getLongestEntryLength(CPUTable); unsigned MaxFeatLen = getLongestEntryLength(FeatTable); @@ -114,6 +121,29 @@ errs() << "Use +feature to enable a feature, or -feature to disable it.\n" "For example, llc -mcpu=mycpu -mattr=+feature1,-feature2\n"; + + PrintOnce = true; +} + +/// Display help for mcpu choices only +static void cpuHelp(ArrayRef CPUTable) { + // the static variable ensures that the help information only gets + // printed once even though a target machine creates multiple subtargets + static bool PrintOnce = false; + if (PrintOnce) { + return; + } + + // Print the CPU table. + errs() << "Available CPUs for this target:\n\n"; + for (auto &CPU : CPUTable) + errs() << "\t" << CPU.Key << "\n"; + errs() << '\n'; + + errs() << "Use -mcpu or -mtune to specify the target's processor.\n" + "For example, clang --target=aarch64-unknown-linux-gui -mcpu=cortex-a35\n"; + + PrintOnce = true; } static FeatureBitset getFeatures(StringRef CPU, StringRef FS, @@ -154,6 +184,8 @@ // Check for help if (Feature == "+help") Help(ProcDesc, ProcFeatures); + else if (Feature == "+cpuHelp") + cpuHelp(ProcDesc); else ApplyFeatureFlag(Bits, Feature, ProcFeatures); }