Skip to content

Commit

Permalink
started new much faster VM
Browse files Browse the repository at this point in the history
  • Loading branch information
marcj committed Jun 28, 2022
1 parent 57900ee commit ef08bdb
Show file tree
Hide file tree
Showing 55 changed files with 6,751 additions and 878 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "libs/imgui"]
path = libs/imgui
url = [email protected]:ocornut/imgui.git
[submodule "libs/asmjit"]
path = libs/asmjit
url = [email protected]:asmjit/asmjit.git
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,26 @@ endif()

include_directories(libs/tracy/)
include_directories(libs/fmt/include/)
include_directories(libs)

list(APPEND CMAKE_MODULE_PATH libs/)
list(APPEND CMAKE_MODULE_PATH libs)

#add_definitions(-DTRACY_ENABLE)
#include_directories(libs/tracy/)

add_subdirectory(libs/tracy)
add_subdirectory(libs/fmt)

set(ASMJIT_STATIC TRUE)
add_subdirectory(libs/asmjit)

# enable for profiling
#add_definitions(-DTRACY_ENABLE)
#link_libraries(Tracy::TracyClient)

add_subdirectory(src)
include_directories(libs/asmjit/src)
include_directories(libs/magic_enum)

include_directories(libs)
add_subdirectory(src)

add_executable(typescript_main main.cpp)

Expand Down
1 change: 1 addition & 0 deletions libs/asmjit
Submodule asmjit added at 06d0ba
File renamed without changes.
48 changes: 16 additions & 32 deletions main.cpp
Original file line number Diff line number Diff line change
@@ -1,59 +1,43 @@
#include <iostream>
#include <fstream>
#include <filesystem>

#include "./src/core.h"
#include "./src/fs.h"
#include "./src/parser2.h"
#include "./src/checker/compiler.h"
#include "./src/checker/vm.h"
#include "./src/checker/debug.h"
#include "./src/checker/compiler.h"

using namespace ts;

auto readFile(const string &file) {
std::ifstream t;
t.open(file);
t.seekg(0, std::ios::end);
size_t size = t.tellg();
std::string buffer(size, ' ');
t.seekg(0);
t.read(&buffer[0], size);
return std::move(buffer);
}

void writeFile(const string &file, const string_view &content) {
std::ofstream t;
t.open(file);
t << content;
}

bool exists(const string &file)
{
std::ifstream infile(file);
return infile.good();
}

void run(const string &bytecode, const string &code, const string &fileName) {
vm::VM vm;
vm.run(bytecode, code, fileName);
vm.printErrors();
auto module = make_shared<vm::Module>(bytecode, fileName, code);
bench(1, [&]{
vm.run(module);
vm.printErrors();
});
}

void compileAndRun(const string &code, const string &file, const string &fileName) {
auto bytecode = file + ".tsbytecode";
auto bytecodePath = file + ".tsb";
auto buffer = readFile(file);
checker::Compiler compiler;
Parser parser;
auto result = parser.parseSourceFile(file, buffer, ts::types::ScriptTarget::Latest, false, ScriptKind::TS, {});
auto program = compiler.compileSourceFile(result);
auto bin = program.build();
writeFile(bytecode, bin);
writeFile(bytecodePath, bin);
std::filesystem::last_write_time(bytecodePath, std::filesystem::last_write_time(file));
vm::VM vm;
vm.run(bin, code, fileName);
checker::printBin(bin);
auto module = make_shared<vm::Module>(bin, fileName, code);
vm.run(module);
vm.printErrors();
}

int main(int argc, char *argv[]) {
std::string file = "/Users/marc/bude/typescript-cpp/tests/basicError1.ts";
std::string file = "/Users/marc/bude/typescript-cpp/tests/big1.ts";
auto cwd = std::filesystem::current_path();

if (argc > 1) {
Expand All @@ -64,7 +48,7 @@ int main(int argc, char *argv[]) {
auto bytecode = file + ".tsb";
auto relative = std::filesystem::relative(file, cwd);

if (exists(bytecode)) {
if (exists(bytecode) && std::filesystem::last_write_time(bytecode) == std::filesystem::last_write_time(file)) {
run(readFile(bytecode), code, relative.string());
} else {
compileAndRun(code, file, relative.string());
Expand Down
3 changes: 2 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ add_subdirectory(tests)
add_library(typescript utf.h utf.cpp core.h core.cpp utilities.h utilities.cpp node_test.h node_test.cpp
syntax_cursor.h syntax_cursor.cpp parser2.h parser2.cpp types.h types.cpp path.h path.cpp
factory.h factory.cpp parenthesizer.h parenthesizer.cpp scanner.h scanner.cpp
checker/vm.h checker/vm.cpp checker/instructions.h checker/compiler.h checker/types.h checker/utils.h checker/checks.h checker/debug.h)
checker/instructions.h checker/compiler.h checker/types.h checker/utils.h checker/checks.h checker/debug.h checker/vm2.cpp)
# ${CMAKE_CURRENT_SOURCE_DIR}/../libs/tracy/TracyClient.cpp

target_link_libraries(typescript fmt)
target_link_libraries(typescript asmjit::asmjit)

add_subdirectory(gui)
235 changes: 235 additions & 0 deletions src/checker/MemoryPool.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
#pragma once

#include <climits>
#include <cstddef>
#include <cstdint>
#include <type_traits>

template<typename T, size_t BlockSize = 4096>
class MemoryPool {
public:
/* Member types */
typedef T value_type;
typedef T *pointer;
typedef T &reference;
typedef const T *const_pointer;
typedef const T &const_reference;
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef std::false_type propagate_on_container_copy_assignment;
typedef std::true_type propagate_on_container_move_assignment;
typedef std::true_type propagate_on_container_swap;

template<typename U>
struct rebind {
typedef MemoryPool<U> other;
};

/* Member functions */
MemoryPool() noexcept;
MemoryPool(const MemoryPool &memoryPool) noexcept;
MemoryPool(MemoryPool &&memoryPool) noexcept;
template<class U>
MemoryPool(const MemoryPool<U> &memoryPool) noexcept;

~MemoryPool() noexcept;

MemoryPool &operator=(const MemoryPool &memoryPool) = delete;
MemoryPool &operator=(MemoryPool &&memoryPool) noexcept;

pointer address(reference x) const noexcept;
const_pointer address(const_reference x) const noexcept;

// Can only allocate one object at a time. n and hint are ignored
pointer allocate(size_type n = 1, const_pointer hint = 0);
void deallocate(pointer p, size_type n = 1);

size_type max_size() const noexcept;

template<class U, class... Args>
void construct(U *p, Args &&... args);

template<class U>
void destroy(U *p);

template<class... Args>
pointer newElement(Args &&... args);
void deleteElement(pointer p);

private:
union Slot_ {
value_type element;
Slot_ *next;
};

typedef char *data_pointer_;
typedef Slot_ slot_type_;
typedef Slot_ *slot_pointer_;

slot_pointer_ currentBlock_;
slot_pointer_ currentSlot_;
slot_pointer_ lastSlot_;
slot_pointer_ freeSlots_;

size_type padPointer(data_pointer_ p, size_type align) const noexcept;
void allocateBlock();

static_assert(BlockSize >= 2 * sizeof(slot_type_), "BlockSize too small.");
};

template<typename T, size_t BlockSize>
inline typename MemoryPool<T, BlockSize>::size_type
MemoryPool<T, BlockSize>::padPointer(data_pointer_ p, size_type align)
const noexcept {
uintptr_t result = reinterpret_cast<uintptr_t>(p);
return ((align - result) % align);
}

template<typename T, size_t BlockSize>
MemoryPool<T, BlockSize>::MemoryPool()
noexcept {
currentBlock_ = nullptr;
currentSlot_ = nullptr;
lastSlot_ = nullptr;
freeSlots_ = nullptr;
}

template<typename T, size_t BlockSize>
MemoryPool<T, BlockSize>::MemoryPool(const MemoryPool &memoryPool)
noexcept :
MemoryPool() {}

template<typename T, size_t BlockSize>
MemoryPool<T, BlockSize>::MemoryPool(MemoryPool &&memoryPool)
noexcept {
currentBlock_ = memoryPool.currentBlock_;
memoryPool.currentBlock_ = nullptr;
currentSlot_ = memoryPool.currentSlot_;
lastSlot_ = memoryPool.lastSlot_;
freeSlots_ = memoryPool.freeSlots;
}

template<typename T, size_t BlockSize>
template<class U>
MemoryPool<T, BlockSize>::MemoryPool(const MemoryPool<U> &memoryPool)
noexcept :
MemoryPool() {}

template<typename T, size_t BlockSize>
MemoryPool<T, BlockSize> &
MemoryPool<T, BlockSize>::operator=(MemoryPool &&memoryPool)
noexcept {
if (this != &memoryPool) {
std::swap(currentBlock_, memoryPool.currentBlock_);
currentSlot_ = memoryPool.currentSlot_;
lastSlot_ = memoryPool.lastSlot_;
freeSlots_ = memoryPool.freeSlots_;
}
return *this;
}

template<typename T, size_t BlockSize>
MemoryPool<T, BlockSize>::~MemoryPool()
noexcept {
slot_pointer_ curr = currentBlock_;
while (curr != nullptr) {
slot_pointer_ prev = curr->next;
operator delete(reinterpret_cast<void *>(curr));
curr = prev;
}
}

template<typename T, size_t BlockSize>
inline typename MemoryPool<T, BlockSize>::pointer
MemoryPool<T, BlockSize>::address(reference x)
const noexcept {
return &x;
}

template<typename T, size_t BlockSize>
inline typename MemoryPool<T, BlockSize>::const_pointer
MemoryPool<T, BlockSize>::address(const_reference x)
const noexcept {
return &x;
}

template<typename T, size_t BlockSize>
void
MemoryPool<T, BlockSize>::allocateBlock() {
// Allocate space for the new block and store a pointer to the previous one
data_pointer_ newBlock = reinterpret_cast<data_pointer_>
(operator new(BlockSize));
reinterpret_cast<slot_pointer_>(newBlock)->next = currentBlock_;
currentBlock_ = reinterpret_cast<slot_pointer_>(newBlock);
// Pad block body to staisfy the alignment requirements for elements
data_pointer_ body = newBlock + sizeof(slot_pointer_);
size_type bodyPadding = padPointer(body, alignof(slot_type_));
currentSlot_ = reinterpret_cast<slot_pointer_>(body + bodyPadding);
lastSlot_ = reinterpret_cast<slot_pointer_>
(newBlock + BlockSize - sizeof(slot_type_) + 1);
}

template<typename T, size_t BlockSize>
inline typename MemoryPool<T, BlockSize>::pointer
MemoryPool<T, BlockSize>::allocate(size_type n, const_pointer hint) {
if (freeSlots_ != nullptr) {
pointer result = reinterpret_cast<pointer>(freeSlots_);
freeSlots_ = freeSlots_->next;
return result;
} else {
if (currentSlot_ >= lastSlot_) {
allocateBlock();
// printf("allocate new block\n");
}
return reinterpret_cast<pointer>(currentSlot_++);
}
}

template<typename T, size_t BlockSize>
inline void
MemoryPool<T, BlockSize>::deallocate(pointer p, size_type n) {
if (p != nullptr) {
reinterpret_cast<slot_pointer_>(p)->next = freeSlots_;
freeSlots_ = reinterpret_cast<slot_pointer_>(p);
}
}

template<typename T, size_t BlockSize>
inline typename MemoryPool<T, BlockSize>::size_type
MemoryPool<T, BlockSize>::max_size()
const noexcept {
size_type maxBlocks = -1 / BlockSize;
return (BlockSize - sizeof(data_pointer_)) / sizeof(slot_type_) * maxBlocks;
}

template<typename T, size_t BlockSize>
template<class U, class... Args>
inline void
MemoryPool<T, BlockSize>::construct(U *p, Args &&... args) {
new(p) U(std::forward<Args>(args)...);
}

template<typename T, size_t BlockSize>
template<class U>
inline void
MemoryPool<T, BlockSize>::destroy(U *p) {
p->~U();
}

template<typename T, size_t BlockSize>
template<class... Args>
inline typename MemoryPool<T, BlockSize>::pointer
MemoryPool<T, BlockSize>::newElement(Args &&... args) {
pointer result = allocate();
construct<value_type>(result, std::forward<Args>(args)...);
return result;
}

template<typename T, size_t BlockSize>
inline void
MemoryPool<T, BlockSize>::deleteElement(pointer p) {
if (p != nullptr) {
p->~value_type();
deallocate(p);
}
}
Loading

0 comments on commit ef08bdb

Please sign in to comment.