gc

Author: ShawSumma

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "vendor/mimalloc"]
 	path = vendor/mimalloc
 	url = https://github.com/microsoft/mimalloc
+[submodule "vendor/light"]
+	path = vendor/light
+	url = https://git.savannah.gnu.org/git/lightning.git

main/minivm.c

@@ -7,17 +7,17 @@
 #include "../vm/std.h"
 #include "../vm/lua/repl.h"
 
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
 #if VM_USE_SPALL
 #define SPALL_AUTO_IMPLEMENTATION
 #include "../vendor/spall/auto.h"
 #endif
 
-__attribute__((no_instrument_function)) int main(int argc, char **argv) {
+#if VM_USE_SPALL
+int __attribute__((no_instrument_function))
+#else
+int
+#endif
+    main(int argc, char **argv) {
 #if VM_USE_SPALL
     spall_auto_init("out.spall");
     spall_auto_thread_init(0, SPALL_DEFAULT_BUFFER_SIZE);
@@ -42,8 +42,6 @@ __attribute__((no_instrument_function)) int main(int argc, char **argv) {
         } else {
             isrepl = false;
 
-            clock_t start = clock();
-
             const char *name = NULL;
             const char *src;
             bool f_flag = true;
@@ -86,6 +84,10 @@ __attribute__((no_instrument_function)) int main(int argc, char **argv) {
         }
     }
 
+    if (isrepl) {
+        vm_lang_lua_repl(vm);
+    }
+
     vm_state_delete(vm);
 
 #if VM_USE_SPALL

main/primes.py

@@ -1,34 +1,37 @@
 import sympy
+import math
 
 max_width = 60
-n = 32
-ls = [2, 4, 8, 16]
+n = 53
+ls = [1, 3, 7, 13, 29]
 
 with open('vm/primes.inc', 'w') as f:
     p32 = 2 ** 32
     while True:
         p = sympy.prevprime(int(n)+1)
         if p >= p32:
             break
+        if len(ls) >= 32:
+            break
         ls.append(p)
         n *= 1.75
     ml = max(map(len, map(str, ls)))
     n = (max_width - 5) // (ml + 2)
     f.write(f'// generated by: python3 main/primes.py\n\n')
-    f.write(f'static const uint64_t vm_primes_table[{len(ls)}] = ' + '{\n    ')
+    f.write(f'static uint32_t vm_primes_table[{len(ls)}] = ' + '{\n    ')
     for i, p in enumerate(ls):
         s = str(p)
         s = ' ' * (ml - len(s)) + s
         f.write(f' {s},')
         if i % n == n - 1:
             f.write('\n    ')
     f.write('\n};\n\n')
-    f.write('static const uint64_t vm_primes_mod(uint8_t p, size_t n) {\n')
+    f.write('static uint32_t vm_primes_mod(uint8_t p, uint32_t n) {\n')
     f.write('    switch (p) {\n')
     f.write('    default:\n')
     f.write('        __builtin_unreachable();\n')
     for i, p in enumerate(ls):
         f.write(f'    case {i}:\n')
         f.write(f'        return n % {p};\n')
     f.write('    }\n')
-    f.write('}\n')
+    f.write('}\n')

makefile

@@ -2,12 +2,14 @@
  # Must be a GCC or Clang
 CC ?= cc
 
-OPT ?= -O2 -flto
+OPT ?= -O3 -ffast-math -flto -DNDEBUG
 
 EXE ?= 
 
 TIME_CMD ?= $(shell which gdate || which date) +%s%3N
 
+LLVM_PROFDATA ?= llvm-profdata
+
 LIBM ?= YES
 LIBM_NO :=
 LIBM_YES := -lm
@@ -18,6 +20,8 @@ BASE_CFLAGS := ${OPT} -Ivendor/tree-sitter/lib/include -Ivendor/mimalloc/include
 BASE_LDFLAGS := ${OPT} ${LDFLAGS} ${LIBM_FLAGS}
 
 # mimalloc
+
+# BASE_LDFLAGS += -lSynchronization
 MI_PRIM_SRC := vendor/mimalloc/src/prim/unix/prim.c
 
 # object files and depends
@@ -31,8 +35,6 @@ MAIN_OBJS = ${MAIN_SRCS:%.c=build/obj/%.o}
 
 MAIN_DEPS = ${MAIN_SRCS:%.c=build/dep/%.dep}
 
-MAKE_INCLUDE ?= 
-
 # tests
 
 TEST_SRCS := $(wildcard test/lua/*/*.lua)
@@ -53,18 +55,19 @@ clean: .dummy
 	rm -rf build
 
 gcc-pgo: .dummy
-	$(MAKE) -Bj minivm OPT="-O3 -flto=auto -fgcse-sm -fgcse-las -fipa-pta -fdevirtualize-at-ltrans -fdevirtualize-speculatively -fno-exceptions -fomit-frame-pointer -fprofile-generate -DNDEBUG"
+	$(MAKE) -Bj minivm OPT="$(OPT) -fgcse-sm -fgcse-las -fipa-pta -fdevirtualize-at-ltrans -fdevirtualize-speculatively -fno-exceptions -fomit-frame-pointer -fprofile-generate"
 	build/bin/minivm test/lua/fib/fib.lua
 	build/bin/minivm test/lua/tables/trees.lua
 	build/bin/minivm test/lua/closure/funcret.lua
-	$(MAKE) -Bj minivm OPT="-O3 -flto=auto -fgcse-sm -fgcse-las -fipa-pta -fdevirtualize-at-ltrans -fdevirtualize-speculatively -fno-exceptions -fomit-frame-pointer -fprofile-use -DNDEBUG"
+	$(MAKE) -Bj minivm OPT="$(OPT) -fgcse-sm -fgcse-las -fipa-pta -fdevirtualize-at-ltrans -fdevirtualize-speculatively -fno-exceptions -fomit-frame-pointer -fprofile-use"
 
 clang-pgo: .dummy
-	$(MAKE) -Bj minivm OPT="-O3 -flto=auto -fno-exceptions -fomit-frame-pointer -fprofile-generate -DNDEBUG"
+	$(MAKE) -Bj minivm OPT="$(OPT) -mllvm -polly -fno-exceptions -fprofile-instr-generate"
 	build/bin/minivm test/lua/fib/fib.lua
 	build/bin/minivm test/lua/tables/trees.lua
 	build/bin/minivm test/lua/closure/funcret.lua
-	$(MAKE) -Bj minivm OPT="-O3 -flto=auto -fno-exceptions -fomit-frame-pointer -fprofile-use -DNDEBUG"
+	$(LLVM_PROFDATA) merge default.profraw -o default.profdata
+	$(MAKE) -Bj minivm OPT="$(OPT) -mllvm -polly -fno-exceptions -fprofile-use"
 
 wasm: .dummy
 	$(MAKE) -Bj CC=emcc EXE=.wasm \
@@ -87,7 +90,7 @@ ${TEST_TXTS}: ${@:build/test/%.log=%.lua} minivm
 ${MAIN_OBJS}:
 	@mkdir -p ${dir ${@}}
 	@mkdir -p ${dir ${@:build/obj/%.o=build/dep/%.dep}}
-	${CC} ${@:build/obj/%.o=%.c}  -c -o ${@} ${BASE_CFLAGS}
+	${CC} ${@:build/obj/%.o=%.c} -c -o ${@} ${BASE_CFLAGS}
 	${CC} ${@:build/obj/%.o=%.c} -MM -MF ${@:build/obj/%.o=build/dep/%.dep} -MT ${@} ${BASE_CFLAGS}
 
 include ${wildcard ${MAIN_DEPS}}

test/lua/basic/elseif.lua

@@ -0,0 +1,10 @@
+
+for x=1, 3 do
+    if x == 1 then
+        print(1)
+    elseif x == 2 then
+        print(2)
+    elseif x == 3 then
+        print(3)
+    end
+end

test/lua/tables/trees-lambda.lua

@@ -0,0 +1,70 @@
+
+local function BottomUpTree(item, depth)
+    if depth > 0 then
+        local i = item + item
+        depth = depth - 1
+        local left = BottomUpTree(i - 1, depth)
+        local right = BottomUpTree(i, depth)
+        return function(n)
+            if n == 1 then
+                return item
+            elseif n == 2 then
+                return left
+            elseif n == 3 then
+                return right
+            else
+                return nil
+            end
+        end
+    else
+        return function(n)
+            if n == 1 then
+                return item
+            else
+                return nil
+            end
+        end
+    end
+end
+
+local function ItemCheck(tree)
+    if tree(2) then
+        return tree(1) + ItemCheck(tree(2)) - ItemCheck(tree(3))
+    else
+        return tree(1)
+    end
+end
+
+local function pow2(n)
+    if n == 0 then
+        return 1
+    else
+        return pow2(n - 1) * 2
+    end
+end
+
+local mindepth = 4
+local maxdepth = tonumber(arg and arg[1]) or 12
+
+local stretchdepth = maxdepth + 1
+
+local stretchtree = BottomUpTree(0, stretchdepth)
+
+local longlivedtree = BottomUpTree(0, maxdepth)
+
+local depth = mindepth
+while depth <= maxdepth do
+    local iterations = pow2(maxdepth - depth + mindepth)
+    local check = 0
+    local i = 1
+    while i <= iterations do
+        local x = ItemCheck(BottomUpTree(1, depth))
+        check = check + x + ItemCheck(BottomUpTree(-1, depth))
+        i = i + 1
+    end
+    print(depth, check)
+    depth = depth + 2
+    -- if vm then vm.gc() end
+end
+
+print(maxdepth, ItemCheck(longlivedtree))