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>
177 lines
5.9 KiB
C++
177 lines
5.9 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 "common/check.h"
|
|
#include "common/error.h"
|
|
#include "explorer/ast/declaration.h"
|
|
#include "explorer/ast/value.h"
|
|
#include "explorer/base/error_builders.h"
|
|
#include "explorer/base/nonnull.h"
|
|
#include "explorer/base/source_location.h"
|
|
#include "explorer/interpreter/type_checker.h"
|
|
|
|
namespace Carbon {
|
|
|
|
// A visitor for type values that collects leaf 'labels', such as class names,
|
|
// and adds them to the signature of a `Match` object.
|
|
class MatchingImplSet::LeafCollector {
|
|
public:
|
|
explicit LeafCollector(Match* match) : match_(match) {}
|
|
|
|
void Collect(const Value* value) {
|
|
value->Visit<void>(
|
|
[&](const auto* derived_value) { VisitValue(derived_value); });
|
|
}
|
|
|
|
void Collect(Label label) { ++match_->signature_[label]; }
|
|
|
|
private:
|
|
// Most kinds of value don't contribute to the signature.
|
|
void VisitValue(const Value* /*unused*/) {}
|
|
|
|
void VisitValue(const TypeType* /*unused*/) { Collect(Label::TypeType); }
|
|
|
|
void VisitValue(const BoolType* /*unused*/) { Collect(Label::BoolType); }
|
|
|
|
void VisitValue(const IntType* /*unused*/) { Collect(Label::IntType); }
|
|
|
|
void VisitValue(const StringType* /*unused*/) { Collect(Label::StringType); }
|
|
|
|
void VisitValue(const StaticArrayType* array) {
|
|
Collect(Label::ArrayType);
|
|
Collect(&array->element_type());
|
|
}
|
|
|
|
void VisitValue(const PointerType* pointer) {
|
|
Collect(Label::PointerType);
|
|
Collect(&pointer->pointee_type());
|
|
}
|
|
|
|
void VisitValue(const StructType* struct_type) {
|
|
Collect(Label::StructType);
|
|
for (auto [name, type] : struct_type->fields()) {
|
|
Collect(type);
|
|
}
|
|
}
|
|
|
|
void VisitValue(const TupleType* tuple_type) {
|
|
Collect(Label::TupleType);
|
|
for (const auto* elem_type : tuple_type->elements()) {
|
|
Collect(elem_type);
|
|
}
|
|
}
|
|
|
|
void VisitValue(const NominalClassType* class_type) {
|
|
VisitDeclarationAndArgs(class_type->declaration(), class_type->bindings());
|
|
}
|
|
|
|
void VisitValue(const MixinPseudoType* mixin_type) {
|
|
VisitDeclarationAndArgs(mixin_type->declaration(), mixin_type->bindings());
|
|
}
|
|
|
|
void VisitValue(const InterfaceType* iface_type) {
|
|
VisitDeclarationAndArgs(iface_type->declaration(), iface_type->bindings());
|
|
}
|
|
|
|
void VisitValue(const NamedConstraintType* constraint_type) {
|
|
VisitDeclarationAndArgs(constraint_type->declaration(),
|
|
constraint_type->bindings());
|
|
}
|
|
|
|
void VisitValue(const ChoiceType* choice_type) {
|
|
VisitDeclarationAndArgs(choice_type->declaration(),
|
|
choice_type->bindings());
|
|
}
|
|
|
|
void VisitDeclarationAndArgs(const Declaration& declaration,
|
|
const Bindings& bindings) {
|
|
Collect(match_->parent_->GetLabelForDeclaration(declaration));
|
|
for (auto [key, value] : bindings.args()) {
|
|
Collect(value);
|
|
}
|
|
}
|
|
|
|
Match* match_;
|
|
};
|
|
|
|
auto MatchingImplSet::GetLabelForDeclaration(const Declaration& declaration)
|
|
-> Label {
|
|
auto [it, added] = declaration_labels_.insert(
|
|
{&declaration,
|
|
static_cast<Label>(static_cast<int>(Label::FirstDeclarationLabel) +
|
|
declaration_labels_.size())});
|
|
return it->second;
|
|
}
|
|
|
|
MatchingImplSet::Match::Match(Nonnull<MatchingImplSet*> parent,
|
|
Nonnull<const ImplScope::ImplFact*> impl,
|
|
Nonnull<const Value*> type,
|
|
Nonnull<const Value*> interface)
|
|
: parent_(parent), impl_(impl), type_(type), interface_(interface) {
|
|
// Build our signature.
|
|
LeafCollector collector(this);
|
|
collector.Collect(type);
|
|
collector.Collect(interface);
|
|
|
|
parent_->matches_.push_back(this);
|
|
}
|
|
|
|
MatchingImplSet::Match::~Match() {
|
|
CARBON_CHECK(parent_->matches_.back() == this, "match stack broken");
|
|
parent_->matches_.pop_back();
|
|
}
|
|
|
|
auto MatchingImplSet::Match::DiagnosePotentialCycle(SourceLocation source_loc)
|
|
-> ErrorOr<Success> {
|
|
// Determine whether any labels in 'a' have a higher count than in 'b'.
|
|
auto any_labels_with_higher_count = [](const Signature& a,
|
|
const Signature& b) {
|
|
if (a.size() > b.size()) {
|
|
// Every label in a signature has a count of at least one.
|
|
return true;
|
|
}
|
|
for (auto [key, a_value] : a) {
|
|
int b_value = b.lookup(key);
|
|
if (a_value > b_value) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
};
|
|
|
|
for (auto* match : parent_->matches_) {
|
|
if (match != this && match->impl_ == impl_ &&
|
|
!any_labels_with_higher_count(match->signature_, signature_)) {
|
|
// No label in the outer match has a higher count than the same label in
|
|
// the inner match. We might have reached a cycle.
|
|
if (any_labels_with_higher_count(signature_, match->signature_)) {
|
|
// The inner match has a higher count for some label. This query is
|
|
// strictly more complex than the outer one, so reject this potential
|
|
// cycle.
|
|
// TODO: Track which label has a higher count, map it back to a string,
|
|
// and include it in this diagnostic.
|
|
return ProgramError(source_loc)
|
|
<< "impl matching recursively performed a more complex match "
|
|
"using the same impl\n"
|
|
<< " outer match: " << *match->type_ << " as "
|
|
<< *match->interface_ << "\n"
|
|
<< " inner match: " << *type_ << " as " << *interface_;
|
|
}
|
|
|
|
if (ValueEqual(match->type_, type_, std::nullopt) &&
|
|
ValueEqual(match->interface_, interface_, std::nullopt)) {
|
|
// We hit the same query twice recursively. This is definitely a cycle.
|
|
return ProgramError(source_loc)
|
|
<< "impl matching for " << *type_ << " as " << *interface_
|
|
<< " recursively performed a match for the same type and "
|
|
"interface";
|
|
}
|
|
}
|
|
}
|
|
|
|
return Success();
|
|
}
|
|
|
|
} // namespace Carbon
|