Load benchmarks from directory

lolleko · lolleko · commit edc37d8e37e0 · 2020-05-06T22:11:55.000+02:00
diff --git a/benchmark/benchmark_types.ts b/benchmark/benchmark_types.ts
@@ -6,6 +6,8 @@ export interface BenchmarkResult {
     kind: BenchmarkKind;
 }
 
+export type BenchmarkFunction = () => void;
+
 export interface MemoryBenchmarkResult extends BenchmarkResult {
     kind: BenchmarkKind.Memory;
     benchmarkName: string;
diff --git a/benchmark/run.ts b/benchmark/run.ts
@@ -1,7 +1,6 @@
 import { runMemoryBenchmark, compareMemoryBenchmarks } from "./memory_benchmark";
-import { isMemoryBenchmarkResult, BenchmarkResult } from "./benchmark_types";
-import detectCyleBenchmark from "./memory_benchmarks/graph_cylce";
-import { json } from "./util";
+import { isMemoryBenchmarkResult, BenchmarkResult, BenchmarkFunction } from "./benchmark_types";
+import { json, readAll, readDir, loadBenchmarksFromDirectory } from "./util";
 
 // CLI arguments
 // arg[0]: path to baseline benchmark data (required because this is also the output path)
@@ -13,8 +12,7 @@ function benchmark() {
     // even if there was no previous one
 
     // Memory tests
-    const memoryBenchmarkInput: (() => void)[] = [detectCyleBenchmark];
-
+    const memoryBenchmarkInput = loadBenchmarksFromDirectory("memory_benchmarks");
     const memoryUpdatedResults = memoryBenchmarkInput.map(runMemoryBenchmark);
 
     // run future benchmarks types here
@@ -52,19 +50,11 @@ function loadMasterBenchmarkData(): string | undefined {
 
     if (masterFileOpen && masterFileOpen[0]) {
         const masterFile = masterFileOpen[0];
-        let masterContent: (string | undefined)[];
-        if (_VERSION == "Lua 5.3") {
-            // @ts-ignore
-            masterContent = masterFile.read("a");
-        } else {
-            // JIT
-            // @ts-ignore
-            masterContent = masterFile.read("*a");
-        }
+        let masterContent = readAll(masterFile);
         masterFile.close();
 
-        if (masterContent[0]) {
-            return masterContent[0];
+        if (masterContent) {
+            return masterContent;
         }
     }
 }
diff --git a/benchmark/util.ts b/benchmark/util.ts
@@ -1,3 +1,5 @@
+import { BenchmarkFunction } from "./benchmark_types";
+
 export function round(num: number, decimalPlaces: number = 0) {
     return tonumber(string.format(`%.${decimalPlaces}f`, num));
 }
@@ -6,3 +8,64 @@ export const json: {
     decode: (this: void, str: string) => {};
     encode: (this: void, val: any) => string;
 } = require("json");
+
+export function readAll(file: LuaFile): string | undefined {
+    let content: (string | undefined)[];
+    if (_VERSION == "Lua 5.3") {
+        // @ts-ignore
+        content = file.read("a");
+    } else {
+        // JIT
+        // @ts-ignore
+        content = file.read("*a");
+    }
+
+    if (content && content[0]) {
+        return content[0];
+    }
+}
+
+export function readDir(dir = ""): string[] | undefined {
+    let isWindows = false;
+    let [success, findHandle] = pcall(() => io.popen(`find ${dir} -type f -d 1`));
+
+    if (!success) {
+        [success, findHandle] = pcall(() => io.popen(`dir /A-D /B ${dir}`));
+        isWindows = true;
+    }
+
+    if (success) {
+        // appereantly TS can't infer this on it's own
+        findHandle = findHandle as LuaFile;
+
+        const findResult = readAll(findHandle);
+        findHandle.close();
+
+        if (findResult) {
+            let files = findResult.split("\n");
+            if (isWindows) {
+                // on windows we need to append the directory path
+                // on unix this is done by find automatically
+                files = files.map(f => `${dir}/${f}`);
+            }
+            return findResult.split("\n").filter(p => p !== "");
+        }
+    }
+}
+
+export function loadBenchmarksFromDirectory(dir = ""): BenchmarkFunction[] {
+    // Memory tests
+    const benchmarkPaths = readDir(dir);
+
+    if (!benchmarkPaths) {
+        return [];
+    }
+
+    return benchmarkPaths.map(f => {
+        // replace slashes with dots
+        let dotPath = string.gsub(f, "%/", ".")[0];
+        // remove extension
+        dotPath = string.gsub(dotPath, ".lua", "")[0];
+        return require(dotPath).default as BenchmarkFunction;
+    });
+}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ export interface BenchmarkResult {`
`6`	`6`	`kind: BenchmarkKind;`
`7`	`7`	`}`
`8`	`8`
	`9`	`+export type BenchmarkFunction = () => void;`
	`10`	`+`
`9`	`11`	`export interface MemoryBenchmarkResult extends BenchmarkResult {`
`10`	`12`	`kind: BenchmarkKind.Memory;`
`11`	`13`	`benchmarkName: string;`