mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-30 19:25:02 +01:00
Chandler Carruth
577fda1ca2
This rejects type literals with more digits than we can lex without APInt's help, and using a custom diagnostic. This is a pretty arbitrary implementation limit, I'm wide open to even more strict rules here. Despite no special casing and a very simplistic approach, by not using APInt this completely eliminates the lexing overhead for `i32` in the generated compilation benchmark where that specific type literal is very common. We see a 10% improvement in lexing there: ``` BM_CompileAPIFileDenseDecls<Phase::Lex>/256 39.0µs ± 4% 34.8µs ± 2% -10.86% (p=0.000 n=19+20) BM_CompileAPIFileDenseDecls<Phase::Lex>/1024 180µs ± 1% 158µs ± 2% -12.22% (p=0.000 n=18+20) BM_CompileAPIFileDenseDecls<Phase::Lex>/4096 731µs ± 2% 641µs ± 1% -12.31% (p=0.000 n=18+20) BM_CompileAPIFileDenseDecls<Phase::Lex>/16384 3.20ms ± 2% 2.86ms ± 2% -10.47% (p=0.000 n=18+19) BM_CompileAPIFileDenseDecls<Phase::Lex>/65536 13.8ms ± 1% 12.4ms ± 2% -9.78% (p=0.000 n=18+19) BM_CompileAPIFileDenseDecls<Phase::Lex>/262144 64.0ms ± 2% 58.4ms ± 2% -8.70% (p=0.000 n=19+18) ``` This starts to fix a TODO in the diagnostic for these by giving a reasonably good diagnostic about a very large type literal. However, in practice it regresses the diagnostics because error tokens produce noisy extraneous diagnostics from parse and check currently. Leaving the TODO there, and I have a follow-up PR to start improving the extraneous diagnostics.
66 lines
2.3 KiB
C++
66 lines
2.3 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_TESTING_COMPILE_HELPER_H_
|
|
#define CARBON_TOOLCHAIN_TESTING_COMPILE_HELPER_H_
|
|
|
|
#include <forward_list>
|
|
|
|
#include "llvm/Support/VirtualFileSystem.h"
|
|
#include "toolchain/diagnostics/diagnostic_consumer.h"
|
|
#include "toolchain/lex/lex.h"
|
|
#include "toolchain/parse/parse.h"
|
|
#include "toolchain/parse/tree_and_subtrees.h"
|
|
#include "toolchain/source/source_buffer.h"
|
|
|
|
namespace Carbon::Testing {
|
|
|
|
// A test helper for compile-related functionality.
|
|
class CompileHelper {
|
|
public:
|
|
// Returns the result of lex.
|
|
auto GetTokenizedBuffer(llvm::StringRef text,
|
|
DiagnosticConsumer* consumer = nullptr)
|
|
-> Lex::TokenizedBuffer&;
|
|
|
|
// Returns the result of lex along with shared values.
|
|
auto GetTokenizedBufferWithSharedValueStore(
|
|
llvm::StringRef text, DiagnosticConsumer* consumer = nullptr)
|
|
-> std::pair<Lex::TokenizedBuffer&, SharedValueStores&>;
|
|
|
|
// Returns the result of parse.
|
|
auto GetTree(llvm::StringRef text) -> Parse::Tree&;
|
|
|
|
// Returns the result of parse (with extra subtree information).
|
|
auto GetTreeAndSubtrees(llvm::StringRef text) -> Parse::TreeAndSubtrees&;
|
|
|
|
// Returns the results of both lex and parse (with extra subtree information).
|
|
auto GetTokenizedBufferWithTreeAndSubtrees(llvm::StringRef text)
|
|
-> std::pair<Lex::TokenizedBuffer&, Parse::TreeAndSubtrees&>;
|
|
|
|
private:
|
|
// Produces a source buffer for the input text.
|
|
auto GetSourceBuffer(llvm::StringRef text) -> SourceBuffer&;
|
|
|
|
// Diagnostics will be printed to console.
|
|
DiagnosticConsumer& consumer_ = ConsoleDiagnosticConsumer();
|
|
|
|
// An index to generate unique filenames.
|
|
int file_index_ = 0;
|
|
|
|
// A filesystem for storing test files.
|
|
llvm::vfs::InMemoryFileSystem fs_;
|
|
|
|
// Storage for various compile artifacts.
|
|
std::forward_list<SourceBuffer> source_storage_;
|
|
std::forward_list<SharedValueStores> value_store_storage_;
|
|
std::forward_list<Lex::TokenizedBuffer> token_storage_;
|
|
std::forward_list<Parse::Tree> tree_storage_;
|
|
std::forward_list<Parse::TreeAndSubtrees> tree_and_subtrees_storage_;
|
|
};
|
|
|
|
} // namespace Carbon::Testing
|
|
|
|
#endif // CARBON_TOOLCHAIN_TESTING_COMPILE_HELPER_H_
|