mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
This switches `DCHECK` and `FATAL` as well. The goal is to reduce the code size impact of these assertions so that we can keep more of them enabled. Currently, the largest cost I see from `CHECK` is not the actual check or the cold code itself, but actually the failure to inline trivial functions due to the presence of the cold code. This means that our goal isn't to reduce apparent code size in the final binary but the LLVM IR cost assessed for these routines in the inliner, which closely correlates with code size but is a bit different. As discussed in #4283, experimentation shows that a single function call with a minimal number of arguments is the lowest cost model for these. This is easily achieved with a format-string API that internally uses `llvm::formatv`. This PR is essentially the `CHECK` version of #4283. However, the check macros are substantially harder to make work with both format strings and streaming because they also take a condition. Also, unexpectedly, I was very successful at devising a regular expression based automated rewrite from the streaming to the format string form with only low 10s of manual fixes. This includes compacting strings broken up across lines, etc. Given how well that went, I've prepared this PR which just directly switches to the format string API and migrate everything to use it. One nice side-effect is that the format string approach ends up greatly simplifying the implementation here as well. This is ... *shockingly* effective. Parsing speeds up by more than 3% with just this change. And checking speeds up by **8%** with this change alone: ``` BM_CompileAPIFileDenseDecls<Phase::Parse>/256 86.3µs ± 1% 82.9µs ± 1% -3.94% (p=0.000 n=17+19) BM_CompileAPIFileDenseDecls<Phase::Parse>/1024 431µs ± 1% 415µs ± 1% -3.76% (p=0.000 n=18+19) BM_CompileAPIFileDenseDecls<Phase::Parse>/4096 1.77ms ± 1% 1.71ms ± 1% -3.18% (p=0.000 n=18+19) BM_CompileAPIFileDenseDecls<Phase::Parse>/16384 7.44ms ± 1% 7.17ms ± 2% -3.56% (p=0.000 n=18+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/65536 30.7ms ± 1% 29.7ms ± 1% -3.15% (p=0.000 n=18+20) BM_CompileAPIFileDenseDecls<Phase::Parse>/262144 131ms ± 1% 127ms ± 1% -2.81% (p=0.000 n=18+18) BM_CompileAPIFileDenseDecls<Phase::Check>/256 878µs ± 2% 800µs ± 1% -8.91% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Check>/1024 1.88ms ± 2% 1.72ms ± 1% -8.56% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Check>/4096 5.78ms ± 2% 5.28ms ± 1% -8.70% (p=0.000 n=20+18) BM_CompileAPIFileDenseDecls<Phase::Check>/16384 21.9ms ± 1% 20.1ms ± 1% -8.02% (p=0.000 n=18+20) BM_CompileAPIFileDenseDecls<Phase::Check>/65536 90.4ms ± 2% 83.1ms ± 1% -8.04% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Check>/262144 381ms ± 2% 352ms ± 1% -7.79% (p=0.000 n=19+19) ``` --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk> Co-authored-by: josh11b <15258583+josh11b@users.noreply.github.com>
159 lines
5.3 KiB
C++
159 lines
5.3 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/install/install_paths.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "common/check.h"
|
|
#include "llvm/ADT/StringExtras.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/FileSystem.h"
|
|
#include "llvm/Support/Path.h"
|
|
#include "llvm/Support/VirtualFileSystem.h"
|
|
#include "tools/cpp/runfiles/runfiles.h"
|
|
|
|
namespace Carbon {
|
|
|
|
// The location within our Bazel output tree of the prefix_root.
|
|
static constexpr llvm::StringLiteral PrefixRoot =
|
|
"carbon/toolchain/install/prefix_root/";
|
|
|
|
// Path within an install prefix for our marker of a valid install.
|
|
static constexpr llvm::StringLiteral MarkerPath =
|
|
"lib/carbon/carbon_install.txt";
|
|
|
|
auto InstallPaths::MakeExeRelative(llvm::StringRef exe_path) -> InstallPaths {
|
|
InstallPaths paths;
|
|
|
|
// Map from the executable path from the executable path to an install
|
|
// prefix path.
|
|
if (!llvm::sys::fs::exists(exe_path)) {
|
|
paths.SetError(llvm::Twine("No file at executable path: ") + exe_path);
|
|
return paths;
|
|
}
|
|
paths = InstallPaths(exe_path);
|
|
|
|
// TODO: Detect a Windows executable path and use custom logic to map to the
|
|
// correct install prefix for that platform.
|
|
|
|
// We assume an executable will be in a `bin` directory and this is a
|
|
// FHS-like install prefix. We remove the filename and walk up to find the
|
|
// expected install prefix.
|
|
llvm::sys::path::remove_filename(paths.prefix_);
|
|
llvm::sys::path::append(paths.prefix_, llvm::sys::path::Style::posix, "../");
|
|
|
|
paths.CheckMarkerFile();
|
|
return paths;
|
|
}
|
|
|
|
auto InstallPaths::MakeForBazelRunfiles(llvm::StringRef exe_path)
|
|
-> InstallPaths {
|
|
using bazel::tools::cpp::runfiles::Runfiles;
|
|
std::string runtimes_error;
|
|
std::unique_ptr<Runfiles> runfiles(
|
|
Runfiles::Create(exe_path.str(), &runtimes_error));
|
|
CARBON_CHECK(runfiles != nullptr, "Failed to find runtimes tree: {0}",
|
|
runtimes_error);
|
|
|
|
std::string relative_marker_path = (PrefixRoot.str() + MarkerPath).str();
|
|
std::string runtimes_marker_path = runfiles->Rlocation(relative_marker_path);
|
|
|
|
// Start from the marker, remove that filename, and walk up to find the
|
|
// install prefix.
|
|
InstallPaths paths(runtimes_marker_path);
|
|
llvm::sys::path::remove_filename(paths.prefix_);
|
|
llvm::sys::path::append(paths.prefix_, llvm::sys::path::Style::posix,
|
|
"../../");
|
|
|
|
paths.CheckMarkerFile();
|
|
CARBON_CHECK(!paths.error(), "{0}", *paths.error());
|
|
return paths;
|
|
}
|
|
|
|
auto InstallPaths::Make(llvm::StringRef install_prefix) -> InstallPaths {
|
|
InstallPaths paths(install_prefix);
|
|
paths.CheckMarkerFile();
|
|
return paths;
|
|
}
|
|
|
|
auto InstallPaths::ReadPreludeManifest() const
|
|
-> ErrorOr<llvm::SmallVector<std::string>> {
|
|
// This is structured to avoid a vector copy on success.
|
|
ErrorOr<llvm::SmallVector<std::string>> result =
|
|
llvm::SmallVector<std::string>();
|
|
|
|
llvm::SmallString<256> manifest;
|
|
llvm::sys::path::append(manifest, llvm::sys::path::Style::posix,
|
|
core_package(), "prelude_manifest.txt");
|
|
|
|
auto fs = llvm::vfs::getRealFileSystem();
|
|
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> file =
|
|
fs->getBufferForFile(manifest);
|
|
if (!file) {
|
|
result = ErrorBuilder() << "Loading prelude manifest `" << manifest
|
|
<< "`: " << file.getError().message();
|
|
return result;
|
|
}
|
|
|
|
// The manifest should have one file per line.
|
|
llvm::StringRef buffer = file.get()->getBuffer();
|
|
while (true) {
|
|
auto [token, remainder] = llvm::getToken(buffer, "\n");
|
|
if (token.empty()) {
|
|
break;
|
|
}
|
|
llvm::SmallString<256> path;
|
|
llvm::sys::path::append(path, llvm::sys::path::Style::posix, core_package(),
|
|
token);
|
|
result->push_back(path.str().str());
|
|
buffer = remainder;
|
|
}
|
|
|
|
if (result->empty()) {
|
|
result = ErrorBuilder() << "Prelude manifest `" << manifest << "` is empty";
|
|
}
|
|
return result;
|
|
}
|
|
|
|
auto InstallPaths::SetError(llvm::Twine message) -> void {
|
|
// Use an empty prefix on error as that should use the working directory which
|
|
// is the least likely problematic.
|
|
prefix_ = "";
|
|
error_ = {message.str()};
|
|
}
|
|
|
|
auto InstallPaths::CheckMarkerFile() -> void {
|
|
llvm::SmallString<256> path(prefix_);
|
|
llvm::sys::path::append(path, llvm::sys::path::Style::posix, MarkerPath);
|
|
if (!llvm::sys::fs::exists(path)) {
|
|
SetError(llvm::Twine("No install marker at path: ") + path);
|
|
}
|
|
}
|
|
|
|
auto InstallPaths::driver() const -> std::string {
|
|
llvm::SmallString<256> path(prefix_);
|
|
// TODO: Adjust this to work equally well on Windows.
|
|
llvm::sys::path::append(path, llvm::sys::path::Style::posix, "bin/carbon");
|
|
return path.str().str();
|
|
}
|
|
|
|
auto InstallPaths::core_package() const -> std::string {
|
|
llvm::SmallString<256> path(prefix_);
|
|
// TODO: Adjust this to work equally well on Windows.
|
|
llvm::sys::path::append(path, llvm::sys::path::Style::posix,
|
|
"lib/carbon/core");
|
|
return path.str().str();
|
|
}
|
|
|
|
auto InstallPaths::llvm_install_bin() const -> std::string {
|
|
llvm::SmallString<256> path(prefix_);
|
|
// TODO: Adjust this to work equally well on Windows.
|
|
llvm::sys::path::append(path, llvm::sys::path::Style::posix,
|
|
"lib/carbon/llvm/bin/");
|
|
return path.str().str();
|
|
}
|
|
|
|
} // namespace Carbon
|