Deukhoofd
/
MalachScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some low hanging fruit in performance.

This commit is contained in:
Deukhoofd 2020-10-09 12:55:49 +02:00
parent 43f080cc48
commit dcb6c58f90
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
6 changed files with 79 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/CoreData/Identifier.hpp
View File

@ -4,6 +4,38 @@
#include <cstdint>
#include <string_view>
namespace MalachScript {
constexpr static uint32_t crc_table[256] = {
0, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832,
0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A,
0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,
0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4,
0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074,
0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525,
0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76,
0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6,
0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7,
0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,
0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330,
0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
class Identifier {
std::u8string_view _str;
uint32_t _hash;
@ -11,27 +43,21 @@ namespace MalachScript {
public:
Identifier() : _hash(0) {}
consteval Identifier(const char8_t* c) : _str(c), _hash(Hash(c)) {}
Identifier(const std::u8string_view& c) : _str(c), _hash(HashStringView(c)) {}
Identifier(const std::u8string_view& c) : _str(c), _hash(Hash(c)) {}
Identifier(const std::u8string_view& c, uint32_t hash) : _str(c), _hash(hash) {}
[[nodiscard]] constexpr inline uint32_t GetHash() const noexcept { return _hash; }
[[nodiscard]] constexpr inline const std::u8string_view& GetString() const noexcept { return _str; }
constexpr inline static uint32_t Hash(const char8_t* input) {
if (*input != 0U) {
return static_cast<uint32_t>(*input) + 33 * Hash(input + 1);
} else {
return 5381;
constexpr inline static uint32_t Hash(const std::u8string_view& sv) {
uint32_t crc = 0xffffffff;
for (auto c : sv) {
crc = (crc >> 8) ^ crc_table[(crc ^ c) & 0xff];
}
};
constexpr inline static uint32_t HashStringView(const std::u8string_view& sv) {
auto init = 5381;
for (auto it = sv.rbegin(); it != sv.rend(); ++it) {
init *= 33;
init += static_cast<uint32_t>(*it);
}
return init;
return crc ^ 0xffffffff;
}
private:
};
}

31
src/Parser/Lexer/LexToken.hpp
View File

@ -12,56 +12,55 @@ namespace MalachScript::Parser {
TextSpan _span;
public:
LexToken(TextSpan span) : _span(span) {}
inline LexToken(const TextSpan& span) : _span(span) {}
virtual ~LexToken() = default;
[[nodiscard]] virtual LexTokenKind GetKind() const noexcept = 0;
[[nodiscard]] const std::unique_ptr<const LexToken>& GetNext() const noexcept { return _next; }
[[nodiscard]] const TextSpan& GetSpan() const noexcept { return _span; }
[[nodiscard]] inline const std::unique_ptr<const LexToken>& GetNext() const noexcept { return _next; }
[[nodiscard]] inline const TextSpan& GetSpan() const noexcept { return _span; }
void SetNext(LexToken* token){
_next = std::unique_ptr<const LexToken>(token);
}
inline void SetNext(LexToken* token) { _next = std::unique_ptr<const LexToken>(token); }
};
template <LexTokenKind kind> class LexTokenImpl : public LexToken {
public:
LexTokenImpl(TextSpan span) : LexToken(span){};
[[nodiscard]] LexTokenKind GetKind() const noexcept final { return kind; }
inline LexTokenImpl(const TextSpan& span) : LexToken(span){};
[[nodiscard]] inline LexTokenKind GetKind() const noexcept final { return kind; }
};
class IntegerLiteral : public LexTokenImpl<LexTokenKind::IntegerLiteral> {
uint64_t _value;
public:
IntegerLiteral(TextSpan span, uint64_t value)
IntegerLiteral(const TextSpan& span, uint64_t value)
: LexTokenImpl<LexTokenKind::IntegerLiteral>(span), _value(value) {}
[[nodiscard]] uint64_t GetValue() const noexcept { return _value; }
[[nodiscard]] inline uint64_t GetValue() const noexcept { return _value; }
};
class FloatLiteral : public LexTokenImpl<LexTokenKind::FloatLiteral> {
double _value;
public:
FloatLiteral(TextSpan span, double value) : LexTokenImpl<LexTokenKind::FloatLiteral>(span), _value(value) {}
[[nodiscard]] double GetValue() const noexcept { return _value; }
FloatLiteral(const TextSpan& span, double value)
: LexTokenImpl<LexTokenKind::FloatLiteral>(span), _value(value) {}
[[nodiscard]] inline double GetValue() const noexcept { return _value; }
};
class StringLiteral : public LexTokenImpl<LexTokenKind::StringLiteral> {
std::u8string _value;
public:
StringLiteral(TextSpan span, std::u8string value)
StringLiteral(const TextSpan& span, std::u8string value)
: LexTokenImpl<LexTokenKind::StringLiteral>(span), _value(std::move(value)) {}
[[nodiscard]] const std::u8string& GetValue() const noexcept { return _value; }
[[nodiscard]] inline const std::u8string& GetValue() const noexcept { return _value; }
};
class IdentifierToken : public LexTokenImpl<LexTokenKind::Identifier> {
Identifier _value;
public:
IdentifierToken(TextSpan span, Identifier value)
IdentifierToken(const TextSpan& span, Identifier value)
: LexTokenImpl<LexTokenKind::Identifier>(span), _value(value) {}
[[nodiscard]] const Identifier& GetValue() const noexcept { return _value; }
[[nodiscard]] inline const Identifier& GetValue() const noexcept { return _value; }
};
}

2
src/Parser/Lexer/Lexer.cpp
View File

@ -466,7 +466,7 @@ namespace MalachScript::Parser {
}
auto str = _script.substr(start, offset);
Progress(offset - 1);
auto hash = Identifier::HashStringView(str);
auto hash = Identifier::Hash(str);
switch (hash) {
case Identifier::Hash(u8"and"):
return Create<LexTokenImpl<LexTokenKind::AndKeyword>>(TextSpan(start, _position));

2
src/Parser/Lexer/Lexer.hpp
View File

@ -38,7 +38,7 @@ namespace MalachScript::Parser {
if (pos >= _scriptLength) {
return '\0';
}
return *(_script.data() + pos);
return _script[pos];
}
LexToken* LexNext();

38
src/Utils/MemoryPool.hpp
View File

@ -6,42 +6,42 @@
#include <stdexcept>
namespace MalachScript::Utils {
template <size_t initialSize, size_t steps>
class MemoryPool {
template <size_t initialSize, size_t steps> class MemoryPool {
public:
MemoryPool() : _offset(0), _capacity(initialSize) {
auto *ptr = malloc(_capacity);
MemoryPool() {
auto* ptr = malloc(initialSize);
if (ptr == nullptr) {
throw std::logic_error("Out of memory.");
}
_memory = static_cast<uint8_t*>(ptr);
_head = static_cast<uint8_t*>(ptr);
_tail = _head;
_end = _head + initialSize;
}
~MemoryPool(){
free(_memory);
}
~MemoryPool() { free(_head); }
template <class T, class... parameters> T* Create(parameters... args){
if (_offset + sizeof(T) >= _capacity) {
template <class T, class... parameters> T* Create(parameters... args) {
auto* p = _tail + sizeof(T);
if (p >= _end) {
IncreaseStep();
}
auto* element = new (_memory + _offset) T(args...);
_offset += sizeof(T);
auto* element = new (_tail) T(args...);
_tail = p;
return element;
}
private:
size_t _offset;
size_t _capacity;
uint8_t* _memory = nullptr;
uint8_t* _tail = nullptr;
uint8_t* _end;
uint8_t* _head = nullptr;
void IncreaseStep(){
_capacity += steps;
auto newPtr = realloc(_memory, _capacity);
void IncreaseStep() {
_end += steps;
auto newPtr = realloc(_head, _end - _head);
if (newPtr == nullptr) {
throw std::logic_error("Out of memory.");
}
_memory = static_cast<uint8_t*>(newPtr);
_head = static_cast<uint8_t*>(newPtr);
}
};
}

5
tests/ParserTests/ParserIntegrationTests.cpp
View File

@ -7,11 +7,12 @@ using namespace MalachScript;
#define PARSE_TEST(name, scriptText, asserts) \
TEST_CASE(name) { \
Diagnostics::Diagnostics diags; \
auto lexer = Parser::Lexer(u8##name, u8##scriptText, &diags); \
auto lexer = Parser::Lexer(u8##name, u8##scriptText, &diags); \
auto token = lexer.Lex(); \
auto parser = Parser::Parser(u8##name, token, &diags); \
auto parser = Parser::Parser(u8##name, token, &diags); \
auto script = parser.Parse(); \
asserts; \
delete script; \
}
PARSE_TEST("Parse class without definition", "class foobar;", {