mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 08:11:05 +01:00
This works to leverage the capabilities of the hashtable as much as possible, for example using the key context in the value stores. However, there may still be opportunities to refactor more deeply and use the functionality even better. Hopefully this is at least a reasonable start and gets us a clean baseline. On an Arm M1, this is a 15% improvement on my large lexing stress test, but ends up a wash on my x86-64 server. This is a smaller benefit than I expected, and it's because we're using a set-of-IDs and looking up values with a key context for things like identifiers. This pattern has a surprising tradeoff. The new hashtable uses significantly less memory, a 10% peak RSS reduction just from the hashtable change. But indirecting through the vector of values makes growing the hashtable dramatically less cache-friendly: it causes growth to randomly access every key when rehashing. On x86, everything gained by the faster hashtable is lost in even slower growth. And even on Arm, this eats into the benefits. But I have a plan to tweak how identifiers specifically work to avoid most of the growth, and so I suspect this is the right tradeoff on the whole. It gives us significant working set size reduction and we can likely avoid the regressed operation (growth with rehash) in most cases by clever reserving and if necessary by adding a hash caching layer to the table infrastructure. --------- Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
144 lines
5.0 KiB
C++
144 lines
5.0 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 HandleStructTypeLiteralStart(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 HandleStructLiteralStart(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 HandleStructFieldDesignator(Context& context,
|
|
Parse::StructFieldDesignatorId /*node_id*/)
|
|
-> bool {
|
|
// This leaves the designated name on top because the `.` isn't interesting.
|
|
CARBON_CHECK(context.node_stack().PeekIsName());
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructComma(Context& context, Parse::StructCommaId /*node_id*/)
|
|
-> bool {
|
|
context.param_and_arg_refs_stack().ApplyComma();
|
|
return true;
|
|
}
|
|
|
|
auto HandleStructField(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 HandleStructTypeField(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 HandleStructLiteral(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 HandleStructTypeLiteral(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
|