carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 11:31:05 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch CARBON_CHECK to a format string API (#4285)

Browse Source 
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:
Chandler Carruth
2024-09-12 16:42:08 +00:00
committed by GitHub
co-authored by Richard Smith josh11b
parent 35dfa5f03c
commit 4845f40dff
140 changed files with 1234 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/import_ref.cpp
+18 -18
View File
@@ -36,8 +36,8 @@ auto SetApiImportIR(Context& context, SemIR::ImportIR import_ir) -> void {
// We don't have a check_ir_id, so add without touching check_ir_map.
ir_id = InternalAddImportIR(context, import_ir);
}
CARBON_CHECK(ir_id == SemIR::ImportIRId::ApiForImpl)
<< "ApiForImpl must be the first IR";
CARBON_CHECK(ir_id == SemIR::ImportIRId::ApiForImpl,
"ApiForImpl must be the first IR");
}
auto AddImportIR(Context& context, SemIR::ImportIR import_ir)
@@ -244,9 +244,9 @@ class ImportRefResolver {
auto [new_const_id, retry] =
TryResolveInst(work.inst_id, existing.const_id);
CARBON_CHECK(!existing.const_id.is_valid() ||
existing.const_id == new_const_id)
<< "Constant value changed in third phase.";
CARBON_CHECK(
!existing.const_id.is_valid() || existing.const_id == new_const_id,
"Constant value changed in third phase.");
if (!existing.const_id.is_valid()) {
SetResolvedConstId(work.inst_id, existing.indirect_insts, new_const_id);
}
@@ -394,8 +394,8 @@ class ImportRefResolver {
}
cursor_inst_id = ir_inst.inst_id;
CARBON_CHECK(cursor_ir != prev_ir || cursor_inst_id != prev_inst_id)
<< cursor_ir->insts().Get(cursor_inst_id);
CARBON_CHECK(cursor_ir != prev_ir || cursor_inst_id != prev_inst_id,
"{0}", cursor_ir->insts().Get(cursor_inst_id));
if (auto const_id =
context_.import_ir_constant_values()[cursor_ir_id.index].Get(
@@ -426,8 +426,8 @@ class ImportRefResolver {
// Returns true if new unresolved constants were found as part of this
// `Resolve` step.
auto HasNewWork() -> bool {
CARBON_CHECK(initial_work_ <= work_stack_.size())
<< "Work shouldn't decrease";
CARBON_CHECK(initial_work_ <= work_stack_.size(),
"Work shouldn't decrease");
return initial_work_ < work_stack_.size();
}
@@ -586,7 +586,7 @@ class ImportRefResolver {
.generic_id;
}
default: {
CARBON_FATAL() << "Unexpected type for generic declaration: " << type;
CARBON_FATAL("Unexpected type for generic declaration: {0}", type);
}
}
}
@@ -736,7 +736,7 @@ class ImportRefResolver {
break;
}
default: {
CARBON_FATAL() << "Unexpected kind: " << bind_inst->kind;
CARBON_FATAL("Unexpected kind: {0}", bind_inst->kind);
}
}
}
@@ -829,8 +829,8 @@ class ImportRefResolver {
break;
}
}
CARBON_FATAL() << "Unexpected instruction kind for name scope: "
<< name_scope_inst;
CARBON_FATAL("Unexpected instruction kind for name scope: {0}",
name_scope_inst);
}
// Given an imported entity base, returns an incomplete, local version of it.
@@ -961,8 +961,8 @@ class ImportRefResolver {
} else {
// Third phase: perform a consistency check and produce the constant we
// created in the second phase.
CARBON_CHECK(result.const_id == inner_const_id)
<< "Constant value changed in third phase.";
CARBON_CHECK(result.const_id == inner_const_id,
"Constant value changed in third phase.");
result.const_id = const_id;
}
@@ -1104,7 +1104,7 @@ class ImportRefResolver {
auto ResolveAsUntyped(SemIR::Inst inst) -> ResolveResult {
CARBON_CHECK(!HasNewWork());
auto result = TryEvalInst(context_, SemIR::InstId::Invalid, inst);
CARBON_CHECK(result.is_constant()) << inst << " is not constant";
CARBON_CHECK(result.is_constant(), "{0} is not constant", inst);
return {.const_id = result};
}
@@ -1602,8 +1602,8 @@ class ImportRefResolver {
new_interface.body_block_id = context_.inst_block_stack().Pop();
new_interface.self_param_id = self_param_id;
CARBON_CHECK(import_scope.extended_scopes.empty())
<< "Interfaces don't currently have extended scopes to support.";
CARBON_CHECK(import_scope.extended_scopes.empty(),
"Interfaces don't currently have extended scopes to support.");
}
auto TryResolveTypedInst(SemIR::InterfaceDecl inst,