mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 07:21:04 +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>
89 lines
3.1 KiB
C++
89 lines
3.1 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_CHECK_DECL_INTRODUCER_STATE_H_
|
|
#define CARBON_TOOLCHAIN_CHECK_DECL_INTRODUCER_STATE_H_
|
|
|
|
#include "toolchain/check/keyword_modifier_set.h"
|
|
#include "toolchain/lex/token_kind.h"
|
|
#include "toolchain/parse/node_ids.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
// State stored for each declaration we are introducing: the kind of
|
|
// declaration and the keyword modifiers that apply to that declaration
|
|
// introducer.
|
|
struct DeclIntroducerState {
|
|
auto modifier_node_id(ModifierOrder order) -> Parse::NodeId {
|
|
return ordered_modifier_node_ids[static_cast<int8_t>(order)];
|
|
}
|
|
auto set_modifier_node_id(ModifierOrder order, Parse::NodeId node_id)
|
|
-> void {
|
|
ordered_modifier_node_ids[static_cast<int8_t>(order)] = node_id;
|
|
}
|
|
|
|
// The token kind of the introducer.
|
|
Lex::TokenKind kind;
|
|
|
|
// Nodes of modifiers on this declaration, in expected order. `Invalid` if no
|
|
// modifier of that kind is present.
|
|
Parse::NodeId
|
|
ordered_modifier_node_ids[static_cast<int8_t>(ModifierOrder::Decl) + 1] =
|
|
{Parse::NodeId::Invalid, Parse::NodeId::Invalid,
|
|
Parse::NodeId::Invalid};
|
|
|
|
// Invariant: contains just the modifiers represented by `saw_*_modifier`.
|
|
KeywordModifierSet modifier_set = KeywordModifierSet();
|
|
|
|
// If there's an `extern library` in use, the library name.
|
|
SemIR::LibraryNameId extern_library = SemIR::LibraryNameId::Invalid;
|
|
};
|
|
|
|
// Stack of `DeclIntroducerState` values, representing all the declaration
|
|
// introducers we are currently nested within. Commonly size 0 or 1, as nested
|
|
// introducers are rare.
|
|
class DeclIntroducerStateStack {
|
|
private:
|
|
// Returns true for introducer tokens. Supports Push/Pop `requires`.
|
|
template <Lex::TokenKind::RawEnumType Kind>
|
|
static constexpr auto IsDeclIntroducer() -> bool {
|
|
switch (Kind) {
|
|
#define CARBON_TOKEN(...)
|
|
#define CARBON_DECL_INTRODUCER_TOKEN(Name, ...) case Lex::TokenKind::Name:
|
|
#include "toolchain/lex/token_kind.def"
|
|
return true;
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
public:
|
|
// Begins a declaration introducer `Kind`.
|
|
template <Lex::TokenKind::RawEnumType Kind>
|
|
requires(IsDeclIntroducer<Kind>())
|
|
auto Push() -> void {
|
|
stack_.push_back({.kind = Lex::TokenKind::Make(Kind)});
|
|
}
|
|
|
|
// Gets the state of declaration at the top of the stack -- the innermost
|
|
// declaration currently being processed.
|
|
auto innermost() -> DeclIntroducerState& { return stack_.back(); }
|
|
|
|
// Finishes a declaration introducer `Kind` and returns the produced state.
|
|
template <Lex::TokenKind::RawEnumType Kind>
|
|
requires(IsDeclIntroducer<Kind>())
|
|
auto Pop() -> DeclIntroducerState {
|
|
CARBON_CHECK(stack_.back().kind == Kind, "Found: {0} expected: {1}",
|
|
stack_.back().kind, Lex::TokenKind::Make(Kind));
|
|
return stack_.pop_back_val();
|
|
}
|
|
|
|
private:
|
|
llvm::SmallVector<DeclIntroducerState> stack_;
|
|
};
|
|
|
|
} // namespace Carbon::Check
|
|
|
|
#endif // CARBON_TOOLCHAIN_CHECK_DECL_INTRODUCER_STATE_H_
|