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>
114 lines
3.9 KiB
C++
114 lines
3.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 "toolchain/parse/context.h"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto HandleOnlyParenExpr(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Advance past the open paren.
|
|
auto open_paren = context.ConsumeChecked(Lex::TokenKind::OpenParen);
|
|
context.AddLeafNode(NodeKind::ParenExprStart, open_paren);
|
|
|
|
state.token = open_paren;
|
|
context.PushState(state, State::OnlyParenExprFinish);
|
|
context.PushState(State::Expr);
|
|
}
|
|
|
|
static auto FinishParenExpr(Context& context,
|
|
const Context::StateStackEntry& state) -> void {
|
|
context.AddNode(NodeKind::ParenExpr, context.Consume(), state.has_error);
|
|
}
|
|
|
|
auto HandleOnlyParenExprFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::CloseParen)) {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(UnexpectedTokenInCompoundMemberAccess, Error,
|
|
"Expected `)`.");
|
|
context.emitter().Emit(*context.position(),
|
|
UnexpectedTokenInCompoundMemberAccess);
|
|
state.has_error = true;
|
|
}
|
|
|
|
// Recover from the invalid token.
|
|
context.SkipTo(context.tokens().GetMatchedClosingToken(state.token));
|
|
}
|
|
|
|
FinishParenExpr(context, state);
|
|
}
|
|
|
|
auto HandleParenExpr(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Advance past the open paren. The placeholder will be replaced at the end
|
|
// based on whether we determine this is a tuple or parenthesized expression.
|
|
context.AddLeafNode(NodeKind::Placeholder,
|
|
context.ConsumeChecked(Lex::TokenKind::OpenParen));
|
|
|
|
if (context.PositionIs(Lex::TokenKind::CloseParen)) {
|
|
context.PushState(state, State::TupleLiteralFinish);
|
|
} else {
|
|
context.PushState(state, State::ParenExprFinish);
|
|
context.PushState(State::ExprAfterOpenParenFinish);
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleExprAfterOpenParenFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto list_token_kind = context.ConsumeListToken(
|
|
NodeKind::TupleLiteralComma, Lex::TokenKind::CloseParen, state.has_error);
|
|
if (list_token_kind == Context::ListTokenKind::Close) {
|
|
return;
|
|
}
|
|
|
|
// We found a comma, so switch parent state to tuple handling.
|
|
auto finish_state = context.PopState();
|
|
CARBON_CHECK(finish_state.state == State::ParenExprFinish,
|
|
"Unexpected parent state, found: {0}", finish_state.state);
|
|
context.PushState(finish_state, State::TupleLiteralFinish);
|
|
|
|
// If the comma is not immediately followed by a close paren, push handlers
|
|
// for the next tuple element.
|
|
if (list_token_kind != Context::ListTokenKind::CommaClose) {
|
|
context.PushState(state, State::TupleLiteralElementFinish);
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleTupleLiteralElementFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (context.ConsumeListToken(NodeKind::TupleLiteralComma,
|
|
Lex::TokenKind::CloseParen, state.has_error) ==
|
|
Context::ListTokenKind::Comma) {
|
|
context.PushState(state);
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleParenExprFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ReplacePlaceholderNode(state.subtree_start, NodeKind::ParenExprStart,
|
|
state.token);
|
|
FinishParenExpr(context, state);
|
|
}
|
|
|
|
auto HandleTupleLiteralFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ReplacePlaceholderNode(state.subtree_start,
|
|
NodeKind::TupleLiteralStart, state.token);
|
|
context.AddNode(NodeKind::TupleLiteral, context.Consume(), state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|