mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 11:06:03 +01:00
This mostly uses a hilarious set of regular expressions to mechanically switch all but two uses, and then manually fixed the last two. There weren't too many. Also simplifies the `vlog` implementation now that it's all going through a format string. This alone has a nice impact on parse and check of about 2% and 1% respectively. The impact on lex in my timings looks like noise (no change in instruction count, unlike the other phases). ``` name old cpu/op new cpu/op delta BM_CompileAPIFileDenseDecls<Phase::Lex>/256 39.1µs ± 3% 38.1µs ± 2% -2.42% (p=0.000 n=20+19) BM_CompileAPIFileDenseDecls<Phase::Lex>/1024 187µs ± 3% 183µs ± 1% -2.30% (p=0.000 n=20+20) BM_CompileAPIFileDenseDecls<Phase::Lex>/4096 776µs ± 4% 756µs ± 1% -2.62% (p=0.000 n=20+20) BM_CompileAPIFileDenseDecls<Phase::Lex>/16384 3.36ms ± 1% 3.33ms ± 1% -0.90% (p=0.000 n=18+18) BM_CompileAPIFileDenseDecls<Phase::Lex>/65536 14.4ms ± 2% 14.2ms ± 1% -1.41% (p=0.000 n=20+20) BM_CompileAPIFileDenseDecls<Phase::Lex>/262144 65.7ms ± 1% 65.2ms ± 2% -0.86% (p=0.002 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/256 87.5µs ± 1% 86.3µs ± 1% -1.43% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/1024 438µs ± 2% 431µs ± 1% -1.54% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/4096 1.81ms ± 2% 1.77ms ± 1% -2.12% (p=0.000 n=20+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/16384 7.54ms ± 1% 7.43ms ± 1% -1.44% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/65536 31.2ms ± 1% 30.6ms ± 1% -2.03% (p=0.000 n=20+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/262144 133ms ± 1% 130ms ± 1% -1.85% (p=0.000 n=20+20) BM_CompileAPIFileDenseDecls<Phase::Check>/256 882µs ± 1% 878µs ± 1% -0.52% (p=0.001 n=17+19) BM_CompileAPIFileDenseDecls<Phase::Check>/1024 1.90ms ± 2% 1.88ms ± 1% -1.17% (p=0.000 n=19+19) BM_CompileAPIFileDenseDecls<Phase::Check>/4096 5.85ms ± 2% 5.76ms ± 1% -1.43% (p=0.000 n=20+19) BM_CompileAPIFileDenseDecls<Phase::Check>/16384 22.2ms ± 2% 21.9ms ± 2% -1.20% (p=0.000 n=20+19) BM_CompileAPIFileDenseDecls<Phase::Check>/65536 91.2ms ± 2% 90.3ms ± 1% -1.00% (p=0.000 n=20+19) BM_CompileAPIFileDenseDecls<Phase::Check>/262144 382ms ± 1% 380ms ± 1% -0.51% (p=0.003 n=18+19) ```
151 lines
5.7 KiB
C++
151 lines
5.7 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/driver/clang_runner.h"
|
|
|
|
#include <algorithm>
|
|
#include <memory>
|
|
#include <numeric>
|
|
#include <optional>
|
|
|
|
#include "clang/Basic/Diagnostic.h"
|
|
#include "clang/Basic/DiagnosticOptions.h"
|
|
#include "clang/Driver/Compilation.h"
|
|
#include "clang/Driver/Driver.h"
|
|
#include "clang/Frontend/CompilerInvocation.h"
|
|
#include "clang/Frontend/TextDiagnosticPrinter.h"
|
|
#include "common/command_line.h"
|
|
#include "common/vlog.h"
|
|
#include "llvm/ADT/ArrayRef.h"
|
|
#include "llvm/ADT/ScopeExit.h"
|
|
#include "llvm/ADT/StringExtras.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/IR/LLVMContext.h"
|
|
#include "llvm/Support/FileSystem.h"
|
|
#include "llvm/Support/Path.h"
|
|
#include "llvm/Support/Program.h"
|
|
#include "llvm/Support/VirtualFileSystem.h"
|
|
#include "llvm/TargetParser/Host.h"
|
|
|
|
namespace Carbon {
|
|
|
|
ClangRunner::ClangRunner(const InstallPaths* install_paths,
|
|
llvm::StringRef target, llvm::raw_ostream* vlog_stream)
|
|
: installation_(install_paths),
|
|
target_(target),
|
|
vlog_stream_(vlog_stream),
|
|
diagnostic_ids_(new clang::DiagnosticIDs()) {}
|
|
|
|
auto ClangRunner::Run(llvm::ArrayRef<llvm::StringRef> args) -> bool {
|
|
// TODO: Maybe handle response file expansion similar to the Clang CLI?
|
|
|
|
// If we have a verbose logging stream, and that stream is the same as
|
|
// `llvm::errs`, then add the `-v` flag so that the driver also prints verbose
|
|
// information.
|
|
bool inject_v_arg = vlog_stream_ == &llvm::errs();
|
|
std::array<llvm::StringRef, 1> v_arg_storage;
|
|
llvm::ArrayRef<llvm::StringRef> maybe_v_arg;
|
|
if (inject_v_arg) {
|
|
v_arg_storage[0] = "-v";
|
|
maybe_v_arg = v_arg_storage;
|
|
}
|
|
|
|
CARBON_CHECK(!args.empty());
|
|
CARBON_VLOG("Running Clang driver with arguments: \n");
|
|
|
|
// Render the arguments into null-terminated C-strings for use by the Clang
|
|
// driver. Command lines can get quite long in build systems so this tries to
|
|
// minimize the memory allocation overhead.
|
|
|
|
// Start with a dummy executable name. We'll manually set the install
|
|
// directory below.
|
|
std::array<llvm::StringRef, 1> exe_arg = {"clang-runner"};
|
|
auto args_range =
|
|
llvm::concat<const llvm::StringRef>(exe_arg, maybe_v_arg, args);
|
|
int total_size = 0;
|
|
for (llvm::StringRef arg : args_range) {
|
|
// Accumulate both the string size and a null terminator byte.
|
|
total_size += arg.size() + 1;
|
|
}
|
|
|
|
// Allocate one chunk of storage for the actual C-strings and a vector of
|
|
// pointers into the storage.
|
|
llvm::OwningArrayRef<char> cstr_arg_storage(total_size);
|
|
llvm::SmallVector<const char*, 64> cstr_args;
|
|
cstr_args.reserve(args.size() + inject_v_arg + 1);
|
|
for (ssize_t i = 0; llvm::StringRef arg : args_range) {
|
|
cstr_args.push_back(&cstr_arg_storage[i]);
|
|
memcpy(&cstr_arg_storage[i], arg.data(), arg.size());
|
|
i += arg.size();
|
|
cstr_arg_storage[i] = '\0';
|
|
++i;
|
|
}
|
|
for (const char* cstr_arg : llvm::ArrayRef(cstr_args)) {
|
|
CARBON_VLOG(" '{0}'\n", cstr_arg);
|
|
}
|
|
|
|
CARBON_VLOG("Preparing Clang driver...\n");
|
|
|
|
// Create the diagnostic options and parse arguments controlling them out of
|
|
// our arguments.
|
|
llvm::IntrusiveRefCntPtr<clang::DiagnosticOptions> diagnostic_options =
|
|
clang::CreateAndPopulateDiagOpts(cstr_args);
|
|
|
|
// TODO: We don't yet support serializing diagnostics the way the actual
|
|
// `clang` command line does. Unclear if we need to or not, but it would need
|
|
// a bit more logic here to set up chained consumers.
|
|
clang::TextDiagnosticPrinter diagnostic_client(llvm::errs(),
|
|
diagnostic_options.get());
|
|
|
|
clang::DiagnosticsEngine diagnostics(
|
|
diagnostic_ids_, diagnostic_options.get(), &diagnostic_client,
|
|
/*ShouldOwnClient=*/false);
|
|
clang::ProcessWarningOptions(diagnostics, *diagnostic_options);
|
|
|
|
clang::driver::Driver driver("clang-runner", target_, diagnostics);
|
|
|
|
// Configure the install directory to find other tools and data files.
|
|
//
|
|
// We directly override the detected directory as we use a synthetic path
|
|
// above. This makes it appear that our binary was in the installed binaries
|
|
// directory, and allows finding tools relative to it.
|
|
driver.Dir = installation_->llvm_install_bin();
|
|
CARBON_VLOG("Setting bin directory to: {0}\n", driver.Dir);
|
|
|
|
// TODO: Directly run in-process rather than using a subprocess. This is both
|
|
// more efficient and makes debugging (much) easier. Needs code like:
|
|
// driver.CC1Main = [](llvm::SmallVectorImpl<const char*>& argv) {};
|
|
std::unique_ptr<clang::driver::Compilation> compilation(
|
|
driver.BuildCompilation(cstr_args));
|
|
CARBON_CHECK(compilation) << "Should always successfully allocate!";
|
|
if (compilation->containsError()) {
|
|
// These should have been diagnosed by the driver.
|
|
return false;
|
|
}
|
|
|
|
CARBON_VLOG("Running Clang driver...\n");
|
|
|
|
llvm::SmallVector<std::pair<int, const clang::driver::Command*>>
|
|
failing_commands;
|
|
int result = driver.ExecuteCompilation(*compilation, failing_commands);
|
|
|
|
// Finish diagnosing any failures before we verbosely log the source of those
|
|
// failures.
|
|
diagnostic_client.finish();
|
|
|
|
CARBON_VLOG("Execution result code: {0}\n", result);
|
|
for (const auto& [command_result, failing_command] : failing_commands) {
|
|
CARBON_VLOG("Failing command '{0}' with code '{1}' was:\n",
|
|
failing_command->getExecutable(), command_result);
|
|
if (vlog_stream_) {
|
|
failing_command->Print(*vlog_stream_, "\n\n", /*Quote=*/true);
|
|
}
|
|
}
|
|
|
|
// Return whether the command was executed successfully.
|
|
return result == 0 && failing_commands.empty();
|
|
}
|
|
|
|
} // namespace Carbon
|