mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 07:55:48 +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>
116 lines
3.7 KiB
C++
116 lines
3.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
|
|
|
|
#ifndef CARBON_TOOLCHAIN_BASE_YAML_H_
|
|
#define CARBON_TOOLCHAIN_BASE_YAML_H_
|
|
|
|
#include "common/check.h"
|
|
#include "common/ostream.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/YAMLTraits.h"
|
|
|
|
// This file provides adapters for outputting YAML using llvm::yaml's APIs. It
|
|
// only supports output, not input. However, it addresses the mix of const and
|
|
// non-const expectations of the llvm::yaml that make it difficult to otherwise
|
|
// use the trait-based approach.
|
|
|
|
namespace Carbon::Yaml {
|
|
|
|
// Helper for printing YAML, to maintain a consistent configuration.
|
|
template <typename T>
|
|
inline auto Print(llvm::raw_ostream& out, T yaml) -> void {
|
|
llvm::yaml::Output yout(out, /*Ctxt=*/nullptr, /*WrapColumn=*/80);
|
|
yout << yaml;
|
|
}
|
|
|
|
// Similar to the standard Printable<T>, but relies on OutputYaml for printing.
|
|
template <typename T>
|
|
class Printable : public Carbon::Printable<T> {
|
|
public:
|
|
auto Print(llvm::raw_ostream& out) const -> void {
|
|
Carbon::Yaml::Print(out, static_cast<const T*>(this)->OutputYaml());
|
|
}
|
|
};
|
|
|
|
// Adapts a function for outputting YAML as a scalar. This currently assumes no
|
|
// scalars passed through this should be quoted.
|
|
class OutputScalar {
|
|
public:
|
|
template <typename T>
|
|
explicit OutputScalar(const T& val)
|
|
: output_([&](llvm::raw_ostream& out) -> void { out << val; }) {}
|
|
|
|
explicit OutputScalar(const llvm::APInt& val)
|
|
: output_([&](llvm::raw_ostream& out) -> void {
|
|
// Carbon's plain APInt storage is typically unsigned.
|
|
val.print(out, /*isSigned=*/false);
|
|
}) {}
|
|
|
|
explicit OutputScalar(std::function<void(llvm::raw_ostream&)> output)
|
|
: output_(std::move(output)) {}
|
|
|
|
auto Output(llvm::raw_ostream& out) const -> void { output_(out); }
|
|
|
|
private:
|
|
std::function<void(llvm::raw_ostream&)> output_;
|
|
};
|
|
|
|
// Adapts a function for outputting YAML as a mapping.
|
|
class OutputMapping {
|
|
public:
|
|
class Map {
|
|
public:
|
|
explicit Map(llvm::yaml::IO& io) : io_(io) {}
|
|
|
|
// Maps a value. This mainly takes responsibility for copying the value,
|
|
// letting mapRequired take `&value`.
|
|
template <typename T>
|
|
auto Add(llvm::StringRef key, T value) -> void {
|
|
io_.mapRequired(key.data(), value);
|
|
}
|
|
|
|
private:
|
|
llvm::yaml::IO& io_;
|
|
};
|
|
|
|
explicit OutputMapping(std::function<void(OutputMapping::Map)> output)
|
|
: output_(std::move(output)) {}
|
|
|
|
auto Output(llvm::yaml::IO& io) -> void { output_(Map(io)); }
|
|
|
|
private:
|
|
std::function<void(OutputMapping::Map)> output_;
|
|
};
|
|
|
|
} // namespace Carbon::Yaml
|
|
|
|
// Link OutputScalar to the llvm::yaml::IO API.
|
|
template <>
|
|
struct llvm::yaml::ScalarTraits<Carbon::Yaml::OutputScalar> {
|
|
static auto output(const Carbon::Yaml::OutputScalar& value, void* /*ctxt*/,
|
|
llvm::raw_ostream& out) -> void {
|
|
value.Output(out);
|
|
}
|
|
static auto input(StringRef /*scalar*/, void* /*ctxt*/,
|
|
Carbon::Yaml::OutputScalar& /*value*/) -> StringRef {
|
|
CARBON_FATAL("Input is unsupported.");
|
|
}
|
|
static auto mustQuote(StringRef /*value*/) -> QuotingType {
|
|
return QuotingType::None;
|
|
}
|
|
};
|
|
static_assert(llvm::yaml::has_ScalarTraits<Carbon::Yaml::OutputScalar>::value);
|
|
|
|
// Link OutputMapping to the llvm::yaml::IO API.
|
|
template <>
|
|
struct llvm::yaml::MappingTraits<Carbon::Yaml::OutputMapping> {
|
|
static auto mapping(IO& io, Carbon::Yaml::OutputMapping& mapping) -> void {
|
|
mapping.Output(io);
|
|
}
|
|
};
|
|
static_assert(llvm::yaml::has_MappingTraits<Carbon::Yaml::OutputMapping,
|
|
llvm::yaml::EmptyContext>::value);
|
|
|
|
#endif // CARBON_TOOLCHAIN_BASE_YAML_H_
|