mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 16:00:09 +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>
141 lines
4.9 KiB
C++
141 lines
4.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/map.h"
|
|
#include "toolchain/check/context.h"
|
|
#include "toolchain/check/convert.h"
|
|
#include "toolchain/check/handle.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructTypeLiteralStartId node_id)
|
|
-> bool {
|
|
context.scope_stack().Push();
|
|
context.node_stack().Push(node_id);
|
|
context.param_and_arg_refs_stack().Push();
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructLiteralStartId node_id)
|
|
-> bool {
|
|
context.scope_stack().Push();
|
|
context.node_stack().Push(node_id);
|
|
context.args_type_info_stack().Push();
|
|
context.param_and_arg_refs_stack().Push();
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context,
|
|
Parse::StructFieldDesignatorId /*node_id*/) -> bool {
|
|
// This leaves the designated name on top because the `.` isn't interesting.
|
|
CARBON_CHECK(context.node_stack().PeekIs<SemIR::NameId>());
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructCommaId /*node_id*/)
|
|
-> bool {
|
|
context.param_and_arg_refs_stack().ApplyComma();
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructFieldId node_id) -> bool {
|
|
auto value_inst_id = context.node_stack().PopExpr();
|
|
auto [name_node, name_id] = context.node_stack().PopNameWithNodeId();
|
|
|
|
// Store the name for the type.
|
|
context.args_type_info_stack().AddInstId(
|
|
context.AddInstInNoBlock<SemIR::StructTypeField>(
|
|
name_node,
|
|
{.name_id = name_id,
|
|
.field_type_id = context.insts().Get(value_inst_id).type_id()}));
|
|
|
|
// Push the value back on the stack as an argument.
|
|
context.node_stack().Push(node_id, value_inst_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructTypeFieldId node_id)
|
|
-> bool {
|
|
auto [type_node, type_id] = context.node_stack().PopExprWithNodeId();
|
|
SemIR::TypeId cast_type_id = ExprAsType(context, type_node, type_id);
|
|
|
|
auto [name_node, name_id] = context.node_stack().PopNameWithNodeId();
|
|
|
|
auto inst_id = context.AddInst<SemIR::StructTypeField>(
|
|
name_node, {.name_id = name_id, .field_type_id = cast_type_id});
|
|
context.node_stack().Push(node_id, inst_id);
|
|
return true;
|
|
}
|
|
|
|
static auto DiagnoseDuplicateNames(Context& context,
|
|
SemIR::InstBlockId type_block_id,
|
|
llvm::StringRef construct) -> bool {
|
|
auto& sem_ir = context.sem_ir();
|
|
auto fields = sem_ir.inst_blocks().Get(type_block_id);
|
|
Map<SemIR::NameId, SemIR::InstId> names;
|
|
auto& insts = sem_ir.insts();
|
|
for (SemIR::InstId field_inst_id : fields) {
|
|
auto field_inst = insts.GetAs<SemIR::StructTypeField>(field_inst_id);
|
|
auto result = names.Insert(field_inst.name_id, field_inst_id);
|
|
if (!result.is_inserted()) {
|
|
CARBON_DIAGNOSTIC(StructNameDuplicate, Error,
|
|
"Duplicated field name `{1}` in {0}.", std::string,
|
|
SemIR::NameId);
|
|
CARBON_DIAGNOSTIC(StructNamePrevious, Note,
|
|
"Field with the same name here.");
|
|
context.emitter()
|
|
.Build(field_inst_id, StructNameDuplicate, construct.str(),
|
|
field_inst.name_id)
|
|
.Note(result.value(), StructNamePrevious)
|
|
.Emit();
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructLiteralId node_id) -> bool {
|
|
auto refs_id = context.param_and_arg_refs_stack().EndAndPop(
|
|
Parse::NodeKind::StructLiteralStart);
|
|
|
|
context.scope_stack().Pop();
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeId<Parse::NodeKind::StructLiteralStart>();
|
|
auto type_block_id = context.args_type_info_stack().Pop();
|
|
if (DiagnoseDuplicateNames(context, type_block_id, "struct literal")) {
|
|
context.node_stack().Push(node_id, SemIR::InstId::BuiltinError);
|
|
return true;
|
|
}
|
|
|
|
auto type_id = context.GetStructType(type_block_id);
|
|
|
|
auto value_id = context.AddInst<SemIR::StructLiteral>(
|
|
node_id, {.type_id = type_id, .elements_id = refs_id});
|
|
context.node_stack().Push(node_id, value_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleParseNode(Context& context, Parse::StructTypeLiteralId node_id)
|
|
-> bool {
|
|
auto refs_id = context.param_and_arg_refs_stack().EndAndPop(
|
|
Parse::NodeKind::StructTypeLiteralStart);
|
|
|
|
context.scope_stack().Pop();
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeId<Parse::NodeKind::StructTypeLiteralStart>();
|
|
|
|
CARBON_CHECK(refs_id != SemIR::InstBlockId::Empty,
|
|
"{{}} is handled by StructLiteral.");
|
|
|
|
if (DiagnoseDuplicateNames(context, refs_id, "struct type literal")) {
|
|
context.node_stack().Push(node_id, SemIR::InstId::BuiltinError);
|
|
return true;
|
|
}
|
|
context.AddInstAndPush<SemIR::StructType>(
|
|
node_id, {.type_id = SemIR::TypeId::TypeType, .fields_id = refs_id});
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|