mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 14:26:02 +01:00
Switch CARBON_CHECK to a format string API (#4285)
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>
This commit is contained in:
co-authored by
Richard Smith
josh11b
parent
35dfa5f03c
commit
4845f40dff
@@ -75,7 +75,7 @@ auto TokenizedBuffer::GetTokenText(TokenIndex token) const -> llvm::StringRef {
|
||||
token_info.kind() == TokenKind::RealLiteral) {
|
||||
std::optional<NumericLiteral> relexed_token =
|
||||
NumericLiteral::Lex(source_->text().substr(token_info.byte_offset()));
|
||||
CARBON_CHECK(relexed_token) << "Could not reform numeric literal token.";
|
||||
CARBON_CHECK(relexed_token, "Could not reform numeric literal token.");
|
||||
return relexed_token->text();
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ auto TokenizedBuffer::GetTokenText(TokenIndex token) const -> llvm::StringRef {
|
||||
if (token_info.kind() == TokenKind::StringLiteral) {
|
||||
std::optional<StringLiteral> relexed_token =
|
||||
StringLiteral::Lex(source_->text().substr(token_info.byte_offset()));
|
||||
CARBON_CHECK(relexed_token) << "Could not reform string literal token.";
|
||||
CARBON_CHECK(relexed_token, "Could not reform string literal token.");
|
||||
return relexed_token->text();
|
||||
}
|
||||
|
||||
@@ -102,56 +102,60 @@ auto TokenizedBuffer::GetTokenText(TokenIndex token) const -> llvm::StringRef {
|
||||
return llvm::StringRef();
|
||||
}
|
||||
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::Identifier) << token_info.kind();
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::Identifier, "{0}",
|
||||
token_info.kind());
|
||||
return value_stores_->identifiers().Get(token_info.ident_id());
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetIdentifier(TokenIndex token) const -> IdentifierId {
|
||||
const auto& token_info = GetTokenInfo(token);
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::Identifier) << token_info.kind();
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::Identifier, "{0}",
|
||||
token_info.kind());
|
||||
return token_info.ident_id();
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetIntLiteral(TokenIndex token) const -> IntId {
|
||||
const auto& token_info = GetTokenInfo(token);
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::IntLiteral) << token_info.kind();
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::IntLiteral, "{0}",
|
||||
token_info.kind());
|
||||
return token_info.int_id();
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetRealLiteral(TokenIndex token) const -> RealId {
|
||||
const auto& token_info = GetTokenInfo(token);
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::RealLiteral)
|
||||
<< token_info.kind();
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::RealLiteral, "{0}",
|
||||
token_info.kind());
|
||||
return token_info.real_id();
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetStringLiteralValue(TokenIndex token) const
|
||||
-> StringLiteralValueId {
|
||||
const auto& token_info = GetTokenInfo(token);
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::StringLiteral)
|
||||
<< token_info.kind();
|
||||
CARBON_CHECK(token_info.kind() == TokenKind::StringLiteral, "{0}",
|
||||
token_info.kind());
|
||||
return token_info.string_literal_id();
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetTypeLiteralSize(TokenIndex token) const -> IntId {
|
||||
const auto& token_info = GetTokenInfo(token);
|
||||
CARBON_CHECK(token_info.kind().is_sized_type_literal()) << token_info.kind();
|
||||
CARBON_CHECK(token_info.kind().is_sized_type_literal(), "{0}",
|
||||
token_info.kind());
|
||||
return token_info.int_id();
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetMatchedClosingToken(TokenIndex opening_token) const
|
||||
-> TokenIndex {
|
||||
const auto& opening_token_info = GetTokenInfo(opening_token);
|
||||
CARBON_CHECK(opening_token_info.kind().is_opening_symbol())
|
||||
<< opening_token_info.kind();
|
||||
CARBON_CHECK(opening_token_info.kind().is_opening_symbol(), "{0}",
|
||||
opening_token_info.kind());
|
||||
return opening_token_info.closing_token_index();
|
||||
}
|
||||
|
||||
auto TokenizedBuffer::GetMatchedOpeningToken(TokenIndex closing_token) const
|
||||
-> TokenIndex {
|
||||
const auto& closing_token_info = GetTokenInfo(closing_token);
|
||||
CARBON_CHECK(closing_token_info.kind().is_closing_symbol())
|
||||
<< closing_token_info.kind();
|
||||
CARBON_CHECK(closing_token_info.kind().is_closing_symbol(), "{0}",
|
||||
closing_token_info.kind());
|
||||
return closing_token_info.opening_token_index();
|
||||
}
|
||||
|
||||
@@ -205,7 +209,7 @@ auto TokenizedBuffer::PrintWidths::Widen(const PrintWidths& widths) -> void {
|
||||
//
|
||||
// This routine requires its argument to be *non-negative*.
|
||||
static auto ComputeDecimalPrintedWidth(int number) -> int {
|
||||
CARBON_CHECK(number >= 0) << "Negative numbers are not supported.";
|
||||
CARBON_CHECK(number >= 0, "Negative numbers are not supported.");
|
||||
if (number == 0) {
|
||||
return 1;
|
||||
}
|
||||
@@ -382,8 +386,8 @@ auto TokenIterator::Print(llvm::raw_ostream& output) const -> void {
|
||||
|
||||
auto TokenizedBuffer::SourceBufferDiagnosticConverter::ConvertLoc(
|
||||
const char* loc, ContextFnT /*context_fn*/) const -> DiagnosticLoc {
|
||||
CARBON_CHECK(StringRefContainsPointer(buffer_->source_->text(), loc))
|
||||
<< "location not within buffer";
|
||||
CARBON_CHECK(StringRefContainsPointer(buffer_->source_->text(), loc),
|
||||
"location not within buffer");
|
||||
int32_t offset = loc - buffer_->source_->text().begin();
|
||||
|
||||
// Find the first line starting after the given location.
|
||||
@@ -392,8 +396,8 @@ auto TokenizedBuffer::SourceBufferDiagnosticConverter::ConvertLoc(
|
||||
[offset](const LineInfo& line) { return line.start <= offset; });
|
||||
|
||||
// Step back one line to find the line containing the given position.
|
||||
CARBON_CHECK(next_line_it != buffer_->line_infos_.begin())
|
||||
<< "location precedes the start of the first line";
|
||||
CARBON_CHECK(next_line_it != buffer_->line_infos_.begin(),
|
||||
"location precedes the start of the first line");
|
||||
const auto* line_it = std::prev(next_line_it);
|
||||
int line_number = line_it - buffer_->line_infos_.begin();
|
||||
int column_number = offset - line_it->start;
|
||||
|
||||
Reference in New Issue
Block a user