Input / output files

Author: pingbird

.gitignore

@@ -1,4 +1,6 @@
 /.idea
 /cmake-*
 /build
-/temp
+/temp
+
+/benchmark.yaml

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(stackvm)
 
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
 
 find_package(LLVM REQUIRED CONFIG)
 

config.yaml

@@ -3,81 +3,59 @@ benchmarks:
     name: hello world
     src: samples/hello.b
     output: a0b65939670bc2c010f4d5d6a0b3e4e4590fb92b
-    batch: 46945466
-    baseline: 111
 
   -
     name: semihash
     src: samples/semihash.b
     input: samples/semihash.in
     output: 5ddd3bb20b4b20d7cb776adc9823f9286a5a9f96
-    batch: 2870
-    baseline: 1267185
 
   -
     name: harmonic
     src: samples/harmonic.b
     output: b6589fc6ab0dc82cf12099d1c2d40ab994e8410c
-    batch: 650176
-    baseline: 7438
 
   -
     name: 8 bit cell size
     src: samples/cell_size.b
     width: 8
     output: 94cfcfa4ce6f757b8211ef5a2882076d7fc4f7bd
-    batch: 146388207
-    baseline: 34
 
   -
     name: 16 bit cell size
     src: samples/cell_size.b
     width: 16
     output: d2bb3c52eaf4286637d9a3df1e6024c2aaeb7728
-    batch: 139989087
-    baseline: 35
 
   -
     name: 32 bit cell size
     src: samples/cell_size.b
     width: 32
     output: 85c954c43002504b11cc5e239de7c6d0cc96e522
-    batch: 160015413
-    baseline: 33
 
   -
     name: mandlebrot
     src: samples/mandlebrot.b
     output: b77a017f811831f0b74e0d69c08b78e620dbda2b
-    batch: 8
-    baseline: 675272993
 
   -
     width: 16
     name: synthetic alias
     src: samples/synthetic_alias.b
     output: 58a74e7d129257f8b0be51f9aa10f8cbb60db621
-    batch: 17768
-    baseline: 282086
 
   -
     name: self interpreter
     src: samples/self_interpreter.b
     input: samples/hello.b
     output: a0b65939670bc2c010f4d5d6a0b3e4e4590fb92b
-    batch: 11575
-    baseline: 437539
 
   -
     name: signed math
     src: samples/signedmath.b
     output: 6a0967cbc5595edf4ef606ea16ca9d314c76b8bc
-    batch: 1895747
-    baseline: 2508
 
   -
     name: sierpinski
     src: samples/sierpinski.b
-    output: 74e24c1e949d69e2cd47c5905140cc068de61b9e
-    batch: 63
-    baseline: 80151435
+    output: 74e24c1e949d69e2cd47c5905140cc068de61b9e

main.cc

@@ -1,6 +1,5 @@
 #include <iostream>
 #include <string>
-#include <filesystem>
 #include <clipp.h>
 #include <fstream>
 
@@ -17,7 +16,7 @@ void printUsageAndExit(group &cli) {
 
   std::cerr << "Usage:\n" << usage_lines(cli, "stackvm", format) << std::endl;
   std::cerr << "Parameters:\n" << documentation(cli, format) << std::endl;
-  exit(1);
+  std::exit(1);
 }
 
 int main(int argc, char** argv) {
@@ -30,6 +29,8 @@ int main(int argc, char** argv) {
 
   auto cli = (
     option("-h", "--help").set(help) % "print this help message",
+    (option("-i", "--input") & value("file", config.inputFile)) % "the file to read from",
+    (option("-o", "--output") & value("file", config.outputFile)) % "the file to write to",
     (option("-w", "--width") & value("bits", config.cellWidth)) % "width of cells in bits\ndefault = 8",
     (option("-e", "--eof") & value("value", config.cellWidth)) % "value of getchar when eof is reached\ndefault = 0",
     (option("-m", "--memory") & value("size", memory)) % "how much virtual memory (in bytes) to reserve to the left and right\ndefault = 128MiB,128MiB",
@@ -71,7 +72,7 @@ int main(int argc, char** argv) {
     std::cerr << std::system_error(
       errno, std::system_category(), "Error: Failed to open \"" + program + "\""
     ).what() << std::endl;
-    exit(1);
+    std::exit(1);
   }
 
   std::stringstream contents;

src/bfvm.cc

@@ -93,8 +93,8 @@ struct CommandLineDiag : Diag {
   void artifact(const std::string &name, const DiagCollector &contents) override {
     if (config.dump.empty()) return;
     std::ofstream file = Util::openFile(config.dump + "/" + name, true);
-	auto contentsStr = contents();
-	file.write(contentsStr.data(), contentsStr.size());
+    auto contentsStr = contents();
+    file.write(contentsStr.data(), contentsStr.size());
     file.close();
   }
 };
@@ -117,6 +117,8 @@ struct IO {
   std::string outputRecording;
   InputState inputState = IS_NONE;
 #endif
+  FILE *inputFile;
+  FILE *outputFile;
   int eofValue = 0;
 };
 
@@ -139,7 +141,7 @@ struct CompileContext {
           !std::filesystem::create_directory(config.dump)
         ) {
           std::cerr << "Error: Failed to create output directory \"" + config.dump + "\"";
-          exit(1);
+          std::exit(1);
         }
         diag->timeline = Util::openFile(config.dump + "/timeline.txt", false);
         diag->timeline << "Time,Event,Label" << "\r\n";
@@ -192,6 +194,16 @@ struct CompileContext {
 
   void run(BFVM::Handle &handle) {
     IO io;
+    if (config.inputFile.empty()) {
+      io.inputFile = stdin;
+    } else {
+      io.inputFile = fopen(config.inputFile.c_str(), "r");
+    }
+    if (config.outputFile.empty()) {
+      io.outputFile = stdout;
+    } else {
+      io.outputFile = fopen(config.outputFile.c_str(), "w");
+    }
     io.eofValue = config.eofValue;
 #ifndef NDIAG
     if (config.profile >= 0) {
@@ -243,7 +255,7 @@ int bfGetchar(IO *io) {
         return io->inputRecording[io->inputIndex++];
       }
     case IS_RECORDING: {
-      int c = getchar();
+      int c = fgetc(io->inputFile);
       if (c == -1) {
         return io->eofValue;
       } else {
@@ -253,23 +265,23 @@ int bfGetchar(IO *io) {
     } default: break;
   }
 #endif
-  int c = getchar();
+  int c = fgetc(io->inputFile);
   if (c == -1) {
     return io->eofValue;
   } else {
     return c;
   }
 }
 
-void bfPutchar(IO *context, int x) {
+void bfPutchar(IO *io, int x) {
 #ifndef NDIAG
-  if (context->inputState == IS_READING) {
+  if (io->inputState == IS_READING) {
     return;
-  } else if (context->inputState == IS_RECORDING) {
-    context->outputRecording.push_back(x);
+  } else if (io->inputState == IS_RECORDING) {
+    io->outputRecording.push_back(x);
   }
 #endif
-  putchar(x);
+  fputc(x, io->outputFile);
 }
 
 struct InterpreterImpl : public BFVM::Interpreter {

src/bfvm.h

@@ -11,6 +11,8 @@ namespace BFVM {
     std::string dump;
     int cellWidth = 8;
     uint32_t eofValue = 0;
+    std::string inputFile;
+    std::string outputFile;
 #ifndef NDIAG
     int profile = -1;
     bool quiet = false;

src/diagnostics.cc

@@ -59,7 +59,7 @@ std::ofstream Util::openFile(const std::string &path, bool binary) {
     std::cerr << std::system_error(
       errno, std::system_category(), "Error: Failed to open \"" + path + "\""
     ).what() << std::endl;
-    exit(1);
+    std::exit(1);
   }
   return file;
 }