mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 17:52:58 +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>
104 lines
3.7 KiB
C++
104 lines
3.7 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
|
|
|
|
#ifndef CARBON_TOOLCHAIN_CHECK_INST_BLOCK_STACK_H_
|
|
#define CARBON_TOOLCHAIN_CHECK_INST_BLOCK_STACK_H_
|
|
|
|
#include "common/array_stack.h"
|
|
#include "llvm/ADT/SmallVector.h"
|
|
#include "toolchain/sem_ir/file.h"
|
|
#include "toolchain/sem_ir/formatter.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
// A stack of instruction blocks that are currently being constructed in a
|
|
// Context. The contents of the instruction blocks are stored here until the
|
|
// instruction block is popped from the stack, at which point they are
|
|
// transferred into the SemIR::File for long-term storage.
|
|
//
|
|
// All pushes and pops will be vlogged.
|
|
class InstBlockStack {
|
|
public:
|
|
explicit InstBlockStack(llvm::StringLiteral name, SemIR::File& sem_ir,
|
|
llvm::raw_ostream* vlog_stream)
|
|
: name_(name), sem_ir_(&sem_ir), vlog_stream_(vlog_stream) {}
|
|
|
|
// Pushes an existing instruction block.
|
|
auto Push(SemIR::InstBlockId id) -> void;
|
|
|
|
// Pushes an existing instruction block with a set of instructions.
|
|
auto Push(SemIR::InstBlockId id, llvm::ArrayRef<SemIR::InstId> inst_ids)
|
|
-> void;
|
|
|
|
// Pushes a new instruction block. It will be invalid unless PeekOrAdd is
|
|
// called in order to support lazy allocation.
|
|
auto Push() -> void { Push(SemIR::InstBlockId::Invalid); }
|
|
|
|
// Pushes a new unreachable code block.
|
|
auto PushUnreachable() -> void { Push(SemIR::InstBlockId::Unreachable); }
|
|
|
|
// Returns the ID of the top instruction block, allocating one if necessary.
|
|
// If `depth` is specified, returns the instruction at `depth` levels from the
|
|
// top of the stack instead of the top block, where the top block is at depth
|
|
// 0.
|
|
auto PeekOrAdd(int depth = 0) -> SemIR::InstBlockId;
|
|
|
|
// Pops the top instruction block. This will always return a valid instruction
|
|
// block; SemIR::InstBlockId::Empty is returned if one wasn't allocated.
|
|
auto Pop() -> SemIR::InstBlockId;
|
|
|
|
// Pops the top instruction block, and discards it if it hasn't had an ID
|
|
// allocated.
|
|
auto PopAndDiscard() -> void;
|
|
|
|
// Adds the given instruction ID to the block at the top of the stack.
|
|
auto AddInstId(SemIR::InstId inst_id) -> void {
|
|
CARBON_CHECK(!empty(), "no current block");
|
|
insts_stack_.AppendToTop(inst_id);
|
|
}
|
|
|
|
// Returns whether the current block is statically reachable.
|
|
auto is_current_block_reachable() -> bool {
|
|
return id_stack_.back() != SemIR::InstBlockId::Unreachable;
|
|
}
|
|
|
|
// Returns a view of the contents of the top instruction block on the stack.
|
|
auto PeekCurrentBlockContents() const -> llvm::ArrayRef<SemIR::InstId> {
|
|
CARBON_CHECK(!empty(), "no current block");
|
|
return insts_stack_.PeekArray();
|
|
}
|
|
|
|
// Prints the stack for a stack dump.
|
|
auto PrintForStackDump(SemIR::Formatter& formatter, int indent,
|
|
llvm::raw_ostream& output) const -> void;
|
|
|
|
// Runs verification that the processing cleanly finished.
|
|
auto VerifyOnFinish() const -> void {
|
|
CARBON_CHECK(empty(), "{0}", id_stack_.size());
|
|
}
|
|
|
|
auto empty() const -> bool { return id_stack_.empty(); }
|
|
|
|
private:
|
|
// A name for debugging.
|
|
llvm::StringLiteral name_;
|
|
|
|
// The underlying SemIR::File instance. Always non-null.
|
|
SemIR::File* sem_ir_;
|
|
|
|
// Whether to print verbose output.
|
|
llvm::raw_ostream* vlog_stream_;
|
|
|
|
// The stack of block IDs. Valid if allocated, Invalid if no block has been
|
|
// allocated, or Unreachable if this block is known to be unreachable.
|
|
llvm::SmallVector<SemIR::InstBlockId> id_stack_;
|
|
|
|
// The stack of insts in each block.
|
|
ArrayStack<SemIR::InstId> insts_stack_;
|
|
};
|
|
|
|
} // namespace Carbon::Check
|
|
|
|
#endif // CARBON_TOOLCHAIN_CHECK_INST_BLOCK_STACK_H_
|